diff --git a/cluster-mgmt/template/onsdemo_edge_template.py b/cluster-mgmt/template/onsdemo_edge_template.py
index cb883f8..c1843a1 100755
--- a/cluster-mgmt/template/onsdemo_edge_template.py
+++ b/cluster-mgmt/template/onsdemo_edge_template.py
@@ -92,7 +92,7 @@
         startsshd( h )
 
 def startiperf( host ):
-    host.cmd( '/usr/bin/iperf', '-sD' )
+    host.cmd( '/usr/bin/iperf', '-s &' )
 
 def startiperfs ( hosts ):
     for h in hosts:
diff --git a/web/topology_rest.py b/web/topology_rest.py
index e56536b..4490cf6 100755
--- a/web/topology_rest.py
+++ b/web/topology_rest.py
@@ -17,9 +17,9 @@
 RestIP="localhost"
 RestPort=8080
 
-LB=True #; True or False
+LB=False #; True or False
 ONOS_DEFAULT_HOST="localhost" ;# Has to set if LB=False
-TESTBED="sw"
+TESTBED="hw"
 DEBUG=1
 
 if (TESTBED == "hw"): 
@@ -848,7 +848,10 @@
   if (TESTBED == "sw"):
     cmd_string="ssh -i ~/.ssh/onlabkey.pem %s 'cd ONOS/scripts; ./link.sh %s %s %s'" % (host, src_dpid, src_port, cmd)
   else:
-    cmd_string="~/ONOS/scripts/link.sh %s %s %s " % ( src_dpid, src_port, cmd)
+    if ( src_dpid == "00:00:00:08:a2:08:f9:01" ):
+      cmd_string="~/ONOS/scripts/link.sh %s %s %s " % ( dst_dpid, dst_port, cmd)
+    else:
+      cmd_string="~/ONOS/scripts/link.sh %s %s %s " % ( src_dpid, src_port, cmd)
   print cmd_string
 
   result=os.popen(cmd_string).read()
@@ -928,7 +931,7 @@
 @app.route("/gui/iperf/rate/<flow_id>")
 def iperf_rate(flow_id):
   if (TESTBED == "hw"):
-    return ""
+    return "{}"
 
   try:
     command = "curl -s \'http://%s:%s/wm/flow/get/%s/json\'" % (RestIP, RestPort, flow_id)