diff --git a/includes/functions.php b/includes/functions.php
index 6cffcd977a..129a1d629a 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -10,7 +10,6 @@ include_once("Net/IPv6.php");
 include_once($config['install_dir'] . "/includes/generic.php");
 include_once($config['install_dir'] . "/includes/ios.php");
 include_once($config['install_dir'] . "/includes/unix.php");
-include_once($config['install_dir'] . "/includes/windows.php");
 include_once($config['install_dir'] . "/includes/procurve.php");
 include_once($config['install_dir'] . "/includes/graphing.php");
 include_once($config['install_dir'] . "/includes/print-functions.php");
diff --git a/includes/polling/device-ios.inc.php b/includes/polling/device-ios.inc.php
index 8644fb9fb7..7723a5c97f 100755
--- a/includes/polling/device-ios.inc.php
+++ b/includes/polling/device-ios.inc.php
@@ -16,6 +16,24 @@
    if(is_file($Ocpurrd) && !is_file($cpurrd)) { rename($Ocpurrd, $cpurrd); echo("Moving $Ocpurrd to $cpurrd");  }
    if(is_file($Omemrrd) && !is_file($memrrd)) { rename($Omemrrd, $memrrd); echo("Moving $Omemrrd to $memrrd");  }
 
+      $version = str_replace("Cisco IOS Software,", "", $sysDescr);
+      $version = str_replace("IOS (tm) ", "", $version);
+      $version = str_replace(",RELEASE SOFTWARE", "", $version);
+      $version = str_replace(",MAINTENANCE INTERIM SOFTWARE", "", $version);
+      $version = str_replace("Version ","", $version);
+      $version = str_replace("Cisco Internetwork Operating System Software", "", $version);
+      $version = trim($version);
+      list($version) = explode("\n", $version);
+      $version = preg_replace("/^[A-Za-z0-9\ \_]*\(([A-Za-z0-9\-\_]*)\), (.+), .*/", "\\1|\\2", $version);
+      $version = str_replace("-M|", "|", $version);
+      $version = str_replace("-", "|", $version);
+      list($hardware, $features, $version) = explode("|", $version);
+      $features = fixIOSFeatures($features);
+      #$hardware = fixIOSHardware($hardware);
+      if(strstr($ciscomodel, "OID")){ unset($ciscomodel); }
+      if(!strstr($ciscomodel, " ") && strlen($ciscomodel) >= '3') {
+        $hardware = $ciscomodel;
+      }
 
    list ($cpu5m, $cpu5s) = explode("\n", `snmpget -O qv -v2c -c $community $hostname 1.3.6.1.4.1.9.2.1.58.0 1.3.6.1.4.1.9.2.1.56.0`);
    $cpu5m = $cpu5m + 0;
diff --git a/includes/polling/device-unix.inc.php b/includes/polling/device-unix.inc.php
index c659449f8f..972fcfe7e4 100755
--- a/includes/polling/device-unix.inc.php
+++ b/includes/polling/device-unix.inc.php
@@ -1,5 +1,7 @@
 <?php
 
+
+
 $Oloadrrd  = "rrd/" . $device['hostname'] . "-load.rrd";
 $Ocpurrd   = "rrd/" . $device['hostname'] . "-cpu.rrd";
 $Omemrrd   = "rrd/" . $device['hostname'] . "-mem.rrd";
@@ -15,6 +17,42 @@ if(is_file($Ocpurrd) && !is_file($cpurrd)) { rename($Ocpurrd, $cpurrd); echo("Mo
 if(is_file($Omemrrd) && !is_file($memrrd)) { rename($Omemrrd, $memrrd); echo("Moving $Omemrrd to $memrrd");  }
 if(is_file($Osysrrd) && !is_file($sysrrd)) { rename($Osysrrd, $sysrrd); echo("Moving $Osysrrd to $sysrrd");  }
 
+      if ($device['os'] == "FreeBSD") {
+        $sysDescr = str_replace(" 0 ", " ", $sysDescr);
+        list(,,$version) = explode (" ", $sysDescr);
+        $hardware = "i386";
+        $features = "GENERIC";
+      } elseif ($device['os'] == "DragonFly") {
+        list(,,$version,,,$features,,$hardware) = explode (" ", $sysDescr);
+      } elseif ($device['os'] == "NetBSD") {
+        list(,,$version,,,$features) = explode (" ", $sysDescr);
+        $features = str_replace("(", "", $features);
+        $features = str_replace(")", "", $features);
+        list(,,$hardware) = explode ("$features", $sysDescr);
+      } elseif ($device['os'] == "OpenBSD") {
+        list(,,$version,$features,$hardware) = explode (" ", $sysDescr);
+        $features = str_replace("(", "", $features);
+        $features = str_replace(")", "", $features);
+      } elseif ($device['os'] == "m0n0wall" || $device['os'] == "Voswall") {
+        list(,,$version,$hardware,$freebsda, $freebsdb, $arch) = split(" ", $sysDescr);
+        $features = $freebsda . " " . $freebsdb;
+        $hardware = "$hardware ($arch)";
+        $hardware = str_replace("\"", "", $hardware);
+      } elseif ($device['os'] == "Linux") {
+        list(,,$version) = explode (" ", $sysDescr);
+        if(strstr($sysDescr, "386")|| strstr($sysDescr, "486")||strstr($sysDescr, "586")||strstr($sysDescr, "686")) { $hardware = "Generic x86"; }
+        if(strstr($sysDescr, "x86_64")) { $hardware = "Generic x86 64-bit"; }
+        $cmd = "snmpget -O qv -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'] . " .1.3.6.1.4.1.2021.7890.1.101.1";
+        $features = trim(`$cmd`);
+        $features = str_replace("No Such Object available on this agent at this OID", "", $features);
+        $features = str_replace("\"", "", $features);
+        // Detect Dell hardware via OpenManage SNMP
+        $cmd = "snmpget -O qv -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'] . " .1.3.6.1.4.1.674.10892.1.300.10.1.9.1";
+        $hw = trim(str_replace("\"", "", `$cmd`));
+        if(strstr($hw, "No")) { unset($hw); } else { $hardware = "Dell " . $hw; }
+      }
+
+
 ## Check Disks
 $dq = mysql_query("SELECT * FROM storage WHERE host_id = '" . $device['device_id'] . "'");
 while ($dr = mysql_fetch_array($dq)) {
diff --git a/includes/windows.php b/includes/polling/device-windows.inc.php
similarity index 93%
rename from includes/windows.php
rename to includes/polling/device-windows.inc.php
index ef4096aeec..d77349a3d8 100755
--- a/includes/windows.php
+++ b/includes/polling/device-windows.inc.php
@@ -1,8 +1,10 @@
 <?
 
-function pollDeviceWin() {
+   if(strstr($sysDescr, "x86")) { $hardware = "Generic x86"; }
+   if(strstr($sysDescr, "Windows Version 5.2")) { $version = "2003 Server"; }
+   if(strstr($sysDescr, "Uniprocessor Free")) { $features = "Uniprocessor"; }
+   if(strstr($sysDescr, "Multiprocessor Free")) { $features = "Multiprocessor"; }
 
-   global $device;
    $hostname = $device['hostname'];
    $hardware = $device['hardware'];
    $version = $device['version'];
@@ -108,6 +110,5 @@ function pollDeviceWin() {
    rrdtool_update($loadrrd, "N:$load1:$load5:$load10");
    rrdtool_update($memrrd, "N:$memTotalSwap:$memAvailSwap:$memTotalReal:$memAvailReal:$memTotalFree:$memShared:$memBuffer:$memCached");
    rrdtool_update($cpurrd, "N:$cpuUser:$cpuSystem:$cpuNice:$cpuIdle");
-}
 
 ?>
diff --git a/poll-device.php b/poll-device.php
index 16018cbee8..862469c78b 100755
--- a/poll-device.php
+++ b/poll-device.php
@@ -91,49 +91,11 @@ while ($device = mysql_fetch_array($device_query)) {
     case "Voswall":
     case "NetBSD":
     case "pfSense":
-      if ($device['os'] == "FreeBSD") {
-        $sysDescr = str_replace(" 0 ", " ", $sysDescr);
-        list(,,$version) = explode (" ", $sysDescr);
-        $hardware = "i386";
-        $features = "GENERIC";
-      } elseif ($device['os'] == "DragonFly") {
-        list(,,$version,,,$features,,$hardware) = explode (" ", $sysDescr);
-      } elseif ($device['os'] == "NetBSD") {
-        list(,,$version,,,$features) = explode (" ", $sysDescr);
-        $features = str_replace("(", "", $features);
-        $features = str_replace(")", "", $features);
-        list(,,$hardware) = explode ("$features", $sysDescr);
-      } elseif ($device['os'] == "OpenBSD") {
-        list(,,$version,$features,$hardware) = explode (" ", $sysDescr);
-        $features = str_replace("(", "", $features);
-        $features = str_replace(")", "", $features);
-      } elseif ($device['os'] == "m0n0wall" || $device['os'] == "Voswall") { 
-	list(,,$version,$hardware,$freebsda, $freebsdb, $arch) = split(" ", $sysDescr);
-	$features = $freebsda . " " . $freebsdb;
-	$hardware = "$hardware ($arch)";	
-        $hardware = str_replace("\"", "", $hardware);
-      } elseif ($device['os'] == "Linux") {
-        list(,,$version) = explode (" ", $sysDescr);
-        if(strstr($sysDescr, "386")|| strstr($sysDescr, "486")||strstr($sysDescr, "586")||strstr($sysDescr, "686")) { $hardware = "Generic x86"; }
-        if(strstr($sysDescr, "x86_64")) { $hardware = "Generic x86 64-bit"; }
-        $cmd = "snmpget -O qv -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'] . " .1.3.6.1.4.1.2021.7890.1.101.1";
-        $features = trim(`$cmd`);
-        $features = str_replace("No Such Object available on this agent at this OID", "", $features);
-        $features = str_replace("\"", "", $features);
-        // Detect Dell hardware via OpenManage SNMP
-        $cmd = "snmpget -O qv -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'] . " .1.3.6.1.4.1.674.10892.1.300.10.1.9.1";
-        $hw = trim(str_replace("\"", "", `$cmd`));      
-        if(strstr($hw, "No")) { unset($hw); } else { $hardware = "Dell " . $hw; }
-      }
-
       include("includes/polling/device-unix.inc.php");
       break;
+
     case "Windows":
-      if(strstr($sysDescr, "x86")) { $hardware = "Generic x86"; }
-      if(strstr($sysDescr, "Windows Version 5.2")) { $version = "2003 Server"; }
-      if(strstr($sysDescr, "Uniprocessor Free")) { $features = "Uniprocessor"; }
-      if(strstr($sysDescr, "Multiprocessor Free")) { $features = "Multiprocessor"; }
-      pollDeviceWin();
+      include("includes/polling/device-windows.inc.php");
       break;
 
     case "ScreenOS":
@@ -149,25 +111,6 @@ while ($device = mysql_fetch_array($device_query)) {
       break;
 
     case "IOS":
-      $version = str_replace("Cisco IOS Software,", "", $sysDescr);
-      $version = str_replace("IOS (tm) ", "", $version);
-      $version = str_replace(",RELEASE SOFTWARE", "", $version);
-      $version = str_replace(",MAINTENANCE INTERIM SOFTWARE", "", $version);
-      $version = str_replace("Version ","", $version);
-      $version = str_replace("Cisco Internetwork Operating System Software", "", $version);
-      $version = trim($version);
-      list($version) = explode("\n", $version);
-      $version = preg_replace("/^[A-Za-z0-9\ \_]*\(([A-Za-z0-9\-\_]*)\), (.+), .*/", "\\1|\\2", $version);
-      $version = str_replace("-M|", "|", $version);
-      $version = str_replace("-", "|", $version);
-      list($hardware, $features, $version) = explode("|", $version);
-      $features = fixIOSFeatures($features);
-      #$hardware = fixIOSHardware($hardware);
-
-      if(strstr($ciscomodel, "OID")){ unset($ciscomodel); }
-      if(!strstr($ciscomodel, " ") && strlen($ciscomodel) >= '3') {
-        $hardware = $ciscomodel;
-      }
       include("includes/polling/device-ios.inc.php");
       break;
 
@@ -199,6 +142,15 @@ while ($device = mysql_fetch_array($device_query)) {
   $where = "WHERE device_id = '" . $device['device_id'] . "' AND deleted = '0'";
   include("includes/polling/interfaces.inc.php");
 
+
+    $update_uptime_attrib = mysql_query("UPDATE devices_attribs SET attrib_value = NOW() WHERE `device_id` = '" . $device['device_id'] . "' AND `attrib_type` = 'polled'");
+    if(mysql_affected_rows() == '0') {
+      $insert_uptime_attrib = mysql_query("INSERT INTO devices_attribs (`device_id`, `attrib_type`, `attrib_value`) VALUES ('" . $device['device_id'] . "', 'polled', NOW())");
+    }
+
+
+
+
   } else {
     $status = '0';
   }
diff --git a/test-discovery.php b/test-discovery.php
index 806add2d51..df2c67089f 100755
--- a/test-discovery.php
+++ b/test-discovery.php
@@ -36,11 +36,9 @@ while ($device = mysql_fetch_array($device_query)) {
 
   echo($device['hostname'] ."\n");
 
-  include("includes/discovery/cisco-physical.php");
-
+#  include("includes/discovery/cisco-physical.php");
 #   include("includes/discovery/ipv6-addresses.php");
-
-#   include("includes/discovery/cisco-pw.php");
+   include("includes/discovery/cisco-pw.php");
 
   echo("\n"); $devices_polled++;
 }