--- a/examples/mixed-wireless.cc	Wed May 21 00:38:49 2008 -0700
+++ b/examples/mixed-wireless.cc	Wed May 21 19:00:38 2008 -0700
@@ -159,8 +159,12 @@
   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));
+  double x = 0.0;
+  for (uint32_t i = 0; i < backboneNodes; ++i)
+    {
+      positionAlloc->Add (Vector (x, 0.0, 0.0));
+      x += 5.0;
+    }
   mobility.SetPositionAllocator (positionAlloc);
   mobility.SetMobilityModel ("ns3::RandomDirection2dMobilityModel",
                              "Bounds", RectangleValue (Rectangle (0, 1000, 0, 1000)),
@@ -268,7 +272,6 @@
         {
           subnetAlloc->Add (Vector (0.0, j, 0.0));
         }
-      mobility.EnableNotifier ();
       mobility.PushReferenceMobilityModel (backbone.Get (i));
       mobility.SetPositionAllocator (subnetAlloc);
       mobility.SetMobilityModel ("ns3::RandomDirection2dMobilityModel",
@@ -329,14 +332,13 @@
   //
   // Let's set up some ns-2-like ascii traces, using another helper class
   //
-  // Look at nodes 11, 13 only
-  // XXX todo
-  // asciiTrace.TraceQueues ("/NodeList/11|13/DeviceList/0");
-  // asciiTrace.TraceNetDeviceRx ("/NodeList/11|13/DeviceList/0");
   std::ofstream ascii;
   ascii.open ("mixed-wireless.tr");
   WifiHelper::EnableAsciiAll (ascii);
   CsmaHelper::EnableAsciiAll (ascii);
+  // Look at nodes 11, 13 only
+  //WifiHelper::EnableAscii (ascii, 11, 0); 
+  //WifiHelper::EnableAscii (ascii, 13, 0); 
 
   // Let's do a pcap trace on the backbone devices
   WifiHelper::EnablePcap ("mixed-wireless", backboneDevices); 
@@ -344,10 +346,11 @@
   CsmaHelper::EnablePcap ("mixed-wireless", appSink->GetId (), 0);
 
 #ifdef ENABLE_FOR_TRACING_EXAMPLE
-  Config::Connect ("/NodeList/*/$MobilityModelNotifier/CourseChange",
+  Config::Connect ("/NodeList/*/$MobilityModel/CourseChange",
     MakeCallback (&CourseChangeCallback));
 #endif
 
+
   /////////////////////////////////////////////////////////////////////////// 
   //                                                                       //
   // Run simulation                                                        //