diff --git a/EduNetworkBuilder/NetTestEditor.cs b/EduNetworkBuilder/NetTestEditor.cs
index 29ae606..6f1b3c9 100644
--- a/EduNetworkBuilder/NetTestEditor.cs
+++ b/EduNetworkBuilder/NetTestEditor.cs
@@ -31,7 +31,7 @@ namespace EduNetworkBuilder
             ToEdit = new NetTest(OrigTest);
 
             Network mynet = NB.GetNetwork();
-            HostNames.AddRange(mynet.GetHostnames());
+            HostNames.AddRange(mynet.GetHostnames(true));
             Networks.AddRange(mynet.GetSubnets());
             Broadcasts.AddRange(mynet.GetBroadcasts());
             UpdateForm();
diff --git a/EduNetworkBuilder/Network.cs b/EduNetworkBuilder/Network.cs
index 0cdb7a3..1c469c3 100644
--- a/EduNetworkBuilder/Network.cs
+++ b/EduNetworkBuilder/Network.cs
@@ -944,7 +944,7 @@ namespace EduNetworkBuilder
             return null;
         }
 
-        public List<string> GetHostnames()
+        public List<string> GetHostnames(bool EvenNonNetworked = false)
         {
             List<string> tList = new List<string>();
             NetworkDevice ND;
@@ -953,7 +953,7 @@ namespace EduNetworkBuilder
                 if(NB.GetComponentType(NC) == GeneralComponentType.device)
                 {
                     ND = (NetworkDevice)NC;
-                    if (ND.GetNetType() == NetworkComponentType.microwave || ND.GetNetType() == NetworkComponentType.fluorescent)
+                    if (!EvenNonNetworked && (ND.GetNetType() == NetworkComponentType.microwave || ND.GetNetType() == NetworkComponentType.fluorescent))
                         continue;
                     tList.Add(ND.hostname);
                 }