Index: /nodes/CNodeCeTIM2/wleiden.conf
===================================================================
--- /nodes/CNodeCeTIM2/wleiden.conf	(revision 9836)
+++ /nodes/CNodeCeTIM2/wleiden.conf	(revision 9837)
@@ -1,4 +1,2 @@
-# Read by /usr/local/sbin/wireless-up.pl
-#
 # config CNodeCeTIM2
 $location="Hooglandse Kerk, Middelweg 2, 2312 KG, Leiden";
@@ -52,9 +50,10 @@
 SDESC=2lumc
 DHCP=no
+MODE=bridge station 
 ESSID=il-z.lumc.wleiden.net
 CHANNEL=136
-NS_MAC=
+NS_MAC=00:15:6D:F2:36:5D
 NS_IP=172.16.4.99/29
-#mode 11a bridge station                                                                       
+                                                                      
 VR1
 
@@ -68,5 +67,5 @@
 SDESC=2imi
 DHCP=no
-MODE=11a bridge master
+MODE=bridge ap
 ESSID=il-zw.cetim2.wleiden.net
 CHANNEL=36
@@ -96,15 +95,17 @@
 
 $config{'ue0'}=sprintf <<UEO;
-COMMENT=Ethernet naar lokaal AP - 172.17.139.10
+COMMENT=Ethernet naar lokaal AP
 TYPE=ethernet
 STATUS=up
 EXTRA_TYPE=eth2wifibridge
-IP=172.17.139.1/24
+IP=172.17.139.1/26
 DESC=CeTIM lokaal AP
 SDESC=lokaalAP
-DHCP=10-250
+DHCP=10-60
 ESSID=ap-WirelessLeiden-HooglandseKerk
 CHANNEL=6
-MODE=master
+MODE=bridge ap
+NS_MAC=00:15:6D:FC:4D:60
+NS_IP=172.17.139.2/26
 UEO
 
Index: /nodes/CNodePlantsoen2/wleiden.conf
===================================================================
--- /nodes/CNodePlantsoen2/wleiden.conf	(revision 9836)
+++ /nodes/CNodePlantsoen2/wleiden.conf	(revision 9837)
@@ -11,10 +11,6 @@
 $release="8.0-RELEASE";
 $ileiden="yes";
-
-
-# edugis x,y 94042,463238
 $X='94042';
 $Y='463238';
-
 
 $config{'ath0'}=sprintf <<ATH0;
@@ -47,25 +43,15 @@
 STATUS=up
 EXTRA_TYPE=eth2wifibridge
-IP=172.16.3.106/30
+IP=172.16.5.116/29
 DHCP=no
 DESC=Ethernet to interlink north-north-west (Stadhuis)
 SDESC=2Stadhuis
-VR1
-
-$config{'vr1:0'}=sprintf <<VR10;
-COMMENT=ethernet
-STATUS=up to nanostation mgmt interface
-TYPE=ethernet
-STATUS=up
-IP=172.16.3.189/30
-DESC=ethernet
-STATUS=up to nanostation mgmt interface
-SDESC=manageNS5
-DHCP=no
-MODE=managed
+MODE=ap station
 ESSID=il-zo.stadhuis.wleiden.net
 CHANNEL=44
 DISTANCE=0.5 km
-VR10
+NS_IP=172.16.5.115/29
+NS_MAC=00:15:6D:BD:67:E8
+VR1
 
 $config{'vr2'}=sprintf <<VR2;
@@ -83,5 +69,5 @@
 CHANNEL=116
 DISTANCE=0.7 km
-NS_MAC= 00:15:6D:BD:67:FF
+NS_MAC=00:15:6D:BD:67:FF
 NS_IP=172.16.5.90/29
 VR2
Index: /nodes/CNodeStadhuis/wleiden.conf
===================================================================
--- /nodes/CNodeStadhuis/wleiden.conf	(revision 9836)
+++ /nodes/CNodeStadhuis/wleiden.conf	(revision 9837)
@@ -14,30 +14,20 @@
 $status='up';
 
-# configuratie van ethernet
 $config{'ue0'}=sprintf <<UE0;
 COMMENT=lokaal ethernet
 STATUS=up via usb-lan adapter
 TYPE=ethernet
+EXTRA_TYPE=eth2wifibridge
 STATUS=up
 IP=$master_ip/26
-DESC=lokaal ethernet
-SDESC=intern
-DHCP=2-62
-# local ap-wds nanostation2 loco ssid ap-WirelessLeiden-atrium 172.17.141.2
-# channel 2
-# enable client isolation is off
-# ap-wds NS2MAC=00:15:6D:FC:4D:C0
+DESC=lokaal ap
+SDESC=internap
+DHCP=10-70
+CHANNEL=2
+MODE=bridge ap wds
+ESSID=ap-WirelessLeiden-atrium
+NS_IP=172.17.141.2/26
+NS2loco_MAC=00:15:6D:FC:4D:C0
 UE0
-
-$config{'ue0:0'}=sprintf <<UE00;
-COMMENT=management interface via usb-lan adapter
-TYPE=ethernet
-STATUS=up
-IP=172.16.3.245/30
-DESC=lokaal ethernet
-STATUS=up
-SDESC=mgmt
-DHCP=no
-UE00
 
 $config{'vr0'}=sprintf <<VR0;
@@ -117,5 +107,5 @@
 STATUS=up
 EXTRA_TYPE=eth2wifibridge
-IP=172.16.5.116/29
+IP=172.16.5.113/29
 DHCP=no
 DESC=Ethernet to interlink south east (Plantsoen)
@@ -126,5 +116,5 @@
 DISTANCE=0.5 km
 NS_MAC=00:15:6D:BD:8A:B3
-NS_IP=172.16.5.115/29
+NS_IP=172.16.5.114/29
 VR3