diff --git a/EduNetworkBuilder/NetworkBuilder.cs b/EduNetworkBuilder/NetworkBuilder.cs
index 6867d0c..67dc1c6 100644
--- a/EduNetworkBuilder/NetworkBuilder.cs
+++ b/EduNetworkBuilder/NetworkBuilder.cs
@@ -1139,7 +1139,9 @@ namespace EduNetworkBuilder
         {
             if (ItemClickedOn != null)
             {
-                ItemClickedOn.PowerOff = false;
+                NB.DoActionPowerOn(ItemClickedOn.GetUniqueIdentifier);
+
+                //ItemClickedOn.PowerOff = false;
                 bool BlowUpOnce = myNetwork.ItemHasTest(ItemClickedOn.hostname, NetTestType.DeviceBlowsUpWithPower) && !myNetwork.ItemTestIsComplete(ItemClickedOn.hostname, NetTestType.DeviceBlowsUpWithPower);
                 bool BlowUpMultiple = myNetwork.ItemHasTest(ItemClickedOn.hostname, NetTestType.DeviceNeedsUPS) && !myNetwork.ItemTestIsComplete(ItemClickedOn.hostname, NetTestType.DeviceNeedsUPS);
                 if (BlowUpOnce || BlowUpMultiple)
@@ -1180,8 +1182,8 @@ namespace EduNetworkBuilder
             {
                 ItemClickedOn.PowerOff = true;
                 //Mark the replace test as "done"
-                NB.DoActionChangeComponent(ItemClickedOn);
-                myNetwork.RegisterDeviceReset(ItemClickedOn.hostname);
+                NB.DoActionPowerOff(ItemClickedOn.GetUniqueIdentifier);
+                //myNetwork.RegisterDeviceReset(ItemClickedOn.hostname);
                 UpdateLinks();
                 UpdateVisuals();
             }