--- a/examples/csma-bridge.cc	Sun Aug 10 15:45:27 2008 -0400
+++ b/examples/csma-bridge.cc	Mon Aug 11 10:30:46 2008 -0700
@@ -94,14 +94,8 @@
 
   // Create the bridge netdevice, which will do the packet switching
   Ptr<Node> switchNode = csmaSwitch.Get (0);
-  Ptr<BridgeNetDevice> bridgeDevice = CreateObject<BridgeNetDevice> ();
-  switchNode->AddDevice (bridgeDevice);
-
-  for (NetDeviceContainer::Iterator portIter = switchDevices.Begin ();
-       portIter != switchDevices.End (); portIter++)
-    {
-      bridgeDevice->AddBridgePort (*portIter);
-    }
+  BridgeHelper bridge;
+  bridge.Install (switchNode, switchDevices);
 
   // Add internet stack to the terminals
   InternetStackHelper internet;