diff --git a/EduNetworkBuilder/Resources/InternetHomeAndOffice.enbx b/EduNetworkBuilder/Resources/InternetHomeAndOffice.enbx
index 754b236..3ee49b5 100644
--- a/EduNetworkBuilder/Resources/InternetHomeAndOffice.enbx
+++ b/EduNetworkBuilder/Resources/InternetHomeAndOffice.enbx
@@ -7,10 +7,10 @@
     <height>1024</height>
     <width>1024</width>
     <itemsize>100</itemsize>
-    <showlabels>False</showlabels>
+    <showlabels>host</showlabels>
     <level>0</level>
     <sortorder>0</sortorder>
-    <uniqueidentifier>230</uniqueidentifier>
+    <uniqueidentifier>235</uniqueidentifier>
     <startinghelplevel>none</startinghelplevel>
     <vlansenabled>True</vlansenabled>
     <VLANPacketColors>True</VLANPacketColors>
@@ -18,7 +18,7 @@
       <hostname>cellphone0</hostname>
       <size>100</size>
       <uniqueidentifier>200</uniqueidentifier>
-      <location>340,680</location>
+      <location>430,670</location>
       <mytype>cellphone</mytype>
       <isdns>False</isdns>
       <isdhcp>False</isdhcp>
@@ -41,6 +41,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>203</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -84,7 +86,7 @@
       <hostname>copier0</hostname>
       <size>100</size>
       <uniqueidentifier>171</uniqueidentifier>
-      <location>510,750</location>
+      <location>860,750</location>
       <mytype>copier</mytype>
       <isdns>False</isdns>
       <isdhcp>False</isdhcp>
@@ -107,6 +109,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>172</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -131,6 +135,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>173</uniqueidentifier>
         <usesdhcp>True</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -148,7 +154,7 @@
       <hostname>firewall0</hostname>
       <size>100</size>
       <uniqueidentifier>150</uniqueidentifier>
-      <location>670,450</location>
+      <location>842,391</location>
       <mytype>firewall</mytype>
       <isdns>False</isdns>
       <isdhcp>True</isdhcp>
@@ -171,6 +177,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>151</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -195,6 +203,8 @@
         <nictype>wan</nictype>
         <uniqueidentifier>154</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>wan0</nicname>
           <myip>
@@ -219,6 +229,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>152</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -262,6 +274,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>153</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth1</nicname>
           <myip>
@@ -291,6 +305,7 @@
         <uniqueidentifier>229</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
         <encryptionkey>CoolVPN</encryptionkey>
+        <ssid />
         <tunnelendpoint>
           <ip>172.16.1.2</ip>
           <mask>255.255.255.0</mask>
@@ -360,11 +375,10 @@
       <hostname>laptop0</hostname>
       <size>100</size>
       <uniqueidentifier>122</uniqueidentifier>
-      <location>120,779</location>
+      <location>160,540</location>
       <mytype>laptop</mytype>
       <isdns>False</isdns>
       <isdhcp>False</isdhcp>
-      <morphcolor>Orange</morphcolor>
       <gateway>
         <ip>0.0.0.0</ip>
         <mask>0.0.0.0</mask>
@@ -383,6 +397,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>123</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -407,6 +423,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>124</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -450,7 +468,7 @@
       <hostname>laptop1</hostname>
       <size>100</size>
       <uniqueidentifier>196</uniqueidentifier>
-      <location>800,760</location>
+      <location>670,460</location>
       <mytype>laptop</mytype>
       <isdns>False</isdns>
       <isdhcp>False</isdhcp>
@@ -473,6 +491,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>197</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -497,6 +517,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>198</uniqueidentifier>
         <usesdhcp>True</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -521,6 +543,8 @@
         <nictype>wlan</nictype>
         <uniqueidentifier>199</uniqueidentifier>
         <usesdhcp>True</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>wlan2</nicname>
           <myip>
@@ -560,6 +584,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>156</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -584,6 +610,8 @@
         <nictype>management_interface</nictype>
         <uniqueidentifier>157</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -610,6 +638,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>158</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -638,6 +668,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>159</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -666,6 +698,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>160</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -694,6 +728,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>161</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -722,6 +758,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>162</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -750,6 +788,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>163</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -778,6 +818,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>164</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -799,11 +841,10 @@
       <hostname>pc0</hostname>
       <size>100</size>
       <uniqueidentifier>119</uniqueidentifier>
-      <location>40,680</location>
+      <location>30,570</location>
       <mytype>pc</mytype>
       <isdns>False</isdns>
       <isdhcp>False</isdhcp>
-      <morphcolor>Orange</morphcolor>
       <gateway>
         <ip>192.168.1.1</ip>
         <mask>0.0.0.0</mask>
@@ -822,6 +863,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>120</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -846,6 +889,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>121</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -863,7 +908,7 @@
       <hostname>pc1</hostname>
       <size>100</size>
       <uniqueidentifier>165</uniqueidentifier>
-      <location>530,450</location>
+      <location>670,840</location>
       <mytype>pc</mytype>
       <isdns>False</isdns>
       <isdhcp>False</isdhcp>
@@ -886,6 +931,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>166</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -910,6 +957,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>167</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -927,7 +976,7 @@
       <hostname>pc2</hostname>
       <size>100</size>
       <uniqueidentifier>168</uniqueidentifier>
-      <location>670,850</location>
+      <location>860,590</location>
       <mytype>pc</mytype>
       <isdns>False</isdns>
       <isdhcp>False</isdhcp>
@@ -950,6 +999,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>169</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -974,6 +1025,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>170</uniqueidentifier>
         <usesdhcp>True</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -991,7 +1044,7 @@
       <hostname>comcast.net</hostname>
       <size>100</size>
       <uniqueidentifier>131</uniqueidentifier>
-      <location>100,310</location>
+      <location>90,150</location>
       <mytype>router</mytype>
       <isdns>False</isdns>
       <isdhcp>False</isdhcp>
@@ -1013,6 +1066,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>132</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -1037,6 +1092,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>133</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -1061,6 +1118,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>134</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth1</nicname>
           <myip>
@@ -1078,7 +1137,7 @@
       <hostname>att.net</hostname>
       <size>100</size>
       <uniqueidentifier>135</uniqueidentifier>
-      <location>280,160</location>
+      <location>314,42</location>
       <mytype>router</mytype>
       <isdns>False</isdns>
       <isdhcp>False</isdhcp>
@@ -1100,6 +1159,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>136</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -1124,6 +1185,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>137</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -1148,6 +1211,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>138</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth1</nicname>
           <myip>
@@ -1171,7 +1236,7 @@
       <hostname>frontiernet.net</hostname>
       <size>100</size>
       <uniqueidentifier>139</uniqueidentifier>
-      <location>470,160</location>
+      <location>564,42</location>
       <mytype>router</mytype>
       <isdns>False</isdns>
       <isdhcp>False</isdhcp>
@@ -1193,6 +1258,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>140</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -1217,6 +1284,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>141</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -1241,6 +1310,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>142</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth1</nicname>
           <myip>
@@ -1265,8 +1336,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>227</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth2</nicname>
           <myip>
@@ -1296,7 +1365,7 @@
       <hostname>verizon.com</hostname>
       <size>100</size>
       <uniqueidentifier>143</uniqueidentifier>
-      <location>620,270</location>
+      <location>800,150</location>
       <mytype>router</mytype>
       <isdns>False</isdns>
       <isdhcp>False</isdhcp>
@@ -1318,6 +1387,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>144</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -1342,6 +1413,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>145</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -1366,6 +1439,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>146</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth1</nicname>
           <myip>
@@ -1383,7 +1458,7 @@
       <hostname>google.com</hostname>
       <size>100</size>
       <uniqueidentifier>147</uniqueidentifier>
-      <location>470,10</location>
+      <location>480,220</location>
       <mytype>server</mytype>
       <isdns>False</isdns>
       <isdhcp>False</isdhcp>
@@ -1405,6 +1480,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>148</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -1429,6 +1506,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>149</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -1446,11 +1525,10 @@
       <hostname>tablet0</hostname>
       <size>100</size>
       <uniqueidentifier>126</uniqueidentifier>
-      <location>280,440</location>
+      <location>200,390</location>
       <mytype>tablet</mytype>
       <isdns>False</isdns>
       <isdhcp>False</isdhcp>
-      <morphcolor>Orange</morphcolor>
       <gateway>
         <ip>0.0.0.0</ip>
         <mask>0.0.0.0</mask>
@@ -1469,6 +1547,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>129</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -1512,7 +1592,7 @@
       <hostname>tablet1</hostname>
       <size>100</size>
       <uniqueidentifier>205</uniqueidentifier>
-      <location>900,390</location>
+      <location>430,870</location>
       <mytype>tablet</mytype>
       <isdns>False</isdns>
       <isdhcp>False</isdhcp>
@@ -1535,6 +1615,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>208</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -1578,7 +1660,7 @@
       <hostname>wap0</hostname>
       <size>100</size>
       <uniqueidentifier>174</uniqueidentifier>
-      <location>480,600</location>
+      <location>530,550</location>
       <mytype>wap</mytype>
       <isdns>False</isdns>
       <isdhcp>False</isdhcp>
@@ -1601,6 +1683,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>177</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -1625,6 +1709,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>178</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth1</nicname>
           <myip>
@@ -1798,7 +1884,7 @@
       <hostname>wap1</hostname>
       <size>100</size>
       <uniqueidentifier>185</uniqueidentifier>
-      <location>840,550</location>
+      <location>540,720</location>
       <mytype>wap</mytype>
       <isdns>False</isdns>
       <isdhcp>False</isdhcp>
@@ -1821,6 +1907,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>188</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -1845,6 +1933,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>189</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth1</nicname>
           <myip>
@@ -2018,7 +2108,7 @@
       <hostname>wrouter0</hostname>
       <size>100</size>
       <uniqueidentifier>100</uniqueidentifier>
-      <location>100,510</location>
+      <location>30,390</location>
       <mytype>wrouter</mytype>
       <isdns>False</isdns>
       <isdhcp>True</isdhcp>
@@ -2040,6 +2130,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>103</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -2064,6 +2156,8 @@
         <nictype>wan</nictype>
         <uniqueidentifier>118</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>wan0</nicname>
           <myip>
@@ -2089,6 +2183,7 @@
         <uniqueidentifier>117</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
         <encryptionkey>CoolVPN</encryptionkey>
+        <ssid />
         <tunnelendpoint>
           <ip>172.16.5.15</ip>
           <mask>255.255.255.0</mask>
@@ -2119,6 +2214,8 @@
         <nictype>management_interface</nictype>
         <uniqueidentifier>104</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -2143,6 +2240,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>105</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -2167,6 +2266,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>106</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -2191,6 +2292,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>107</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -2215,6 +2318,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>108</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -2602,23 +2707,6 @@
       <linktype>normal</linktype>
       <uniqueidentifier>213</uniqueidentifier>
     </link>
-    <link>
-      <SrcNic>
-        <hostid>122</hostid>
-        <nicid>125</nicid>
-        <hostname>laptop0</hostname>
-        <nicname>wlan2</nicname>
-      </SrcNic>
-      <DstNic>
-        <hostid>100</hostid>
-        <nicid>110</nicid>
-        <hostname>wrouter0</hostname>
-        <nicname>wport7</nicname>
-      </DstNic>
-      <hostname>laptop0_link_wrouter0</hostname>
-      <linktype>wireless</linktype>
-      <uniqueidentifier>211</uniqueidentifier>
-    </link>
     <link>
       <SrcNic>
         <hostid>139</hostid>
@@ -2687,23 +2775,6 @@
       <linktype>normal</linktype>
       <uniqueidentifier>216</uniqueidentifier>
     </link>
-    <link>
-      <SrcNic>
-        <hostid>185</hostid>
-        <nicid>190</nicid>
-        <hostname>wap1</hostname>
-        <nicname>wport2</nicname>
-      </SrcNic>
-      <DstNic>
-        <hostid>205</hostid>
-        <nicid>209</nicid>
-        <hostname>tablet1</hostname>
-        <nicname>wlan0</nicname>
-      </DstNic>
-      <hostname>wap1_link_tablet1</hostname>
-      <linktype>wireless</linktype>
-      <uniqueidentifier>218</uniqueidentifier>
-    </link>
     <link>
       <SrcNic>
         <hostid>165</hostid>
@@ -2772,6 +2843,40 @@
       <linktype>normal</linktype>
       <uniqueidentifier>226</uniqueidentifier>
     </link>
+    <link>
+      <SrcNic>
+        <hostid>122</hostid>
+        <nicid>125</nicid>
+        <hostname>laptop0</hostname>
+        <nicname>wlan2</nicname>
+      </SrcNic>
+      <DstNic>
+        <hostid>100</hostid>
+        <nicid>110</nicid>
+        <hostname>wrouter0</hostname>
+        <nicname>wport7</nicname>
+      </DstNic>
+      <hostname>laptop0_link_wrouter0</hostname>
+      <linktype>wireless</linktype>
+      <uniqueidentifier>233</uniqueidentifier>
+    </link>
+    <link>
+      <SrcNic>
+        <hostid>205</hostid>
+        <nicid>209</nicid>
+        <hostname>tablet1</hostname>
+        <nicname>wlan0</nicname>
+      </SrcNic>
+      <DstNic>
+        <hostid>185</hostid>
+        <nicid>190</nicid>
+        <hostname>wap1</hostname>
+        <nicname>wport2</nicname>
+      </DstNic>
+      <hostname>tablet1_link_wap1</hostname>
+      <linktype>wireless</linktype>
+      <uniqueidentifier>234</uniqueidentifier>
+    </link>
     <VLANName
       ID="1"
       Color="Blue">Default</VLANName>