diff --git a/scripts/setup-iperf b/scripts/setup-iperf
index 63d20e0..e28478b 100755
--- a/scripts/setup-iperf
+++ b/scripts/setup-iperf
@@ -4,7 +4,7 @@ source scan-dmidecode
 
 mkdir -p $OUTPUT_DIR/iperf
 
-for PORT in {5257..5261} ; do
+for PORT in {5213..5235} ; do
 	iperf3 -p $PORT \
 	--logfile $OUTPUT_DIR/iperf/server.$PORT.log \
 	--server --daemon
diff --git a/scripts/test-iperf b/scripts/test-iperf
index 433efe6..cc23661 100755
--- a/scripts/test-iperf
+++ b/scripts/test-iperf
@@ -1,18 +1,23 @@
 #!/bin/bash
 
 source scan-netdev
+VLANS='110 218 222 226 306 321 480'
+CTLPLANE=110
+MY_DATE=`date +%Y-%m-%d_%H-%M-%S`
 mkdir -p $OUTPUT_DIR/iperf
 
-MY_PORT=`cat /etc/netdev/vlan.400.csv \
-	| grep $SERVER_SERIAL \
-	| cut -d ',' -f 3 \
-	| cut -d '.' -f 4`
+if [[ -n $1 ]] ; then
+	LABEL=".$1"
+fi
+
+MY_PORT=`grep $SERVER_SERIAL /etc/netdev/vlan.$CTLPLANE.csv \
+	| cut -d ',' -f 3 | cut -d '.' -f 4`
 if [[ -z $MY_PORT ]] ; then
 	echo "My Port empty"
 	exit 27
 fi
 
-for VLAN in 401 402 403 404 406 ; do
+for VLAN in $VLANS ; do
 	if [[ -f /etc/netdev/vlan.$VLAN.csv ]] ; then
 		VLAN_CONF=`grep $SERVER_SERIAL \
 			/etc/netdev/vlan.$VLAN.csv` 
@@ -20,14 +25,13 @@ for VLAN in 401 402 403 404 406 ; do
 	if [[ -z $VLAN_CONF ]] ; then
 		continue
 	fi
-	IP_LIST=`cat /etc/netdev/vlan.$VLAN.csv \
-		| grep -v 'STOC' \
+	IP_LIST=`sed 's/#.*$//'  /etc/netdev/vlan.$VLAN.csv \
 		| cut -d ',' -f 3 \
 		| grep '^[0-9]' | sort`
 	for IP in $IP_LIST; do 
 		echo -n "$IP - "  
 		iperf3  -P 4 -p 52$MY_PORT \
-			--logfile $OUTPUT_DIR/iperf/client.$IP.slave.2.log \
+			--logfile $OUTPUT_DIR/iperf/client.$IP$LABEL.log \
 			-c $IP
 		echo $?