--- a/tutorial/tutorial-1.cc	Mon Sep 24 13:28:27 2007 -0700
+++ b/tutorial/tutorial-1.cc	Wed Sep 26 19:55:09 2007 -0700
@@ -47,36 +47,26 @@
     CsmaTopology::CreateCsmaChannel (DataRate (5000000), MilliSeconds (2));
 
   uint32_t nd0 = CsmaIpv4Topology::AddIpv4CsmaNetDevice (n0, lan, 
-    Mac48Address("08:00:2e:00:00:00"));
+    "08:00:2e:00:00:00");
 
   uint32_t nd1 = CsmaIpv4Topology::AddIpv4CsmaNetDevice (n1, lan, 
-    Mac48Address("08:00:2e:00:00:01"));
+    "08:00:2e:00:00:01");
 
   uint32_t nd2 = CsmaIpv4Topology::AddIpv4CsmaNetDevice (n2, lan, 
-    Mac48Address("08:00:2e:00:00:02"));
+    "08:00:2e:00:00:02");
 
   uint32_t nd3 = CsmaIpv4Topology::AddIpv4CsmaNetDevice (n3, lan, 
-    Mac48Address("08:00:2e:00:00:03"));
-
-  CsmaIpv4Topology::AddIpv4Address (n0, nd0, Ipv4Address ("10.1.1.1"), 
-    Ipv4Mask ("255.255.255.0"));
-
-  CsmaIpv4Topology::AddIpv4Address (n1, nd1, Ipv4Address ("10.1.1.2"), 
-    Ipv4Mask ("255.255.255.0"));
+    "08:00:2e:00:00:03");
 
-  CsmaIpv4Topology::AddIpv4Address (n2, nd2, Ipv4Address ("10.1.1.3"), 
-    Ipv4Mask ("255.255.255.0"));
+  CsmaIpv4Topology::AddIpv4Address (n0, nd0, "10.1.1.1", "255.255.255.0");
+  CsmaIpv4Topology::AddIpv4Address (n1, nd1, "10.1.1.2", "255.255.255.0");
+  CsmaIpv4Topology::AddIpv4Address (n2, nd2, "10.1.1.3", "255.255.255.0");
+  CsmaIpv4Topology::AddIpv4Address (n3, nd3, "10.1.1.4", "255.255.255.0");
 
-  CsmaIpv4Topology::AddIpv4Address (n3, nd3, Ipv4Address ("10.1.1.4"), 
-    Ipv4Mask ("255.255.255.0"));
-
-  uint32_t packetSize = 1024;
   uint16_t port = 7;
-  uint32_t maxPacketCount = 1;
-  Time interPacketInterval = Seconds (1.);
 
   Ptr<UdpEchoClient> client = Create<UdpEchoClient> (n0, "10.1.1.2", port, 
-    maxPacketCount, interPacketInterval, packetSize);
+    1, Seconds(1.), 1024);
 
   Ptr<UdpEchoServer> server = Create<UdpEchoServer> (n1, port);