diff --git a/html/includes/print-interface.inc.php b/html/includes/print-interface.inc.php
index 996069a44b..1c02fb8a14 100644
--- a/html/includes/print-interface.inc.php
+++ b/html/includes/print-interface.inc.php
@@ -38,9 +38,18 @@ else {
 
 echo "<tr style=\"background-color: $row_colour;\" valign=top onmouseover=\"this.style.backgroundColor='$list_highlight';\" onmouseout=\"this.style.backgroundColor='$row_colour';\" style='cursor: pointer;'>
     <td valign=top width=350 onclick=\"location.href='".generate_port_url($port)."'\">";
-echo '        <span class=list-large>
+
+// Don't echo out ports ifIndex if it's a NOS device since their ifIndex is, for lack of better words....different
+if ($device['os'] == 'nos') {
+    echo '        <span class=list-large>
+        '.generate_port_link($port, $port['label'])." $error_img $mac
+        </span><br /><span class=interface-desc>".$port['ifAlias'].'</span>';
+}
+else {
+    echo '        <span class=list-large>
     '.generate_port_link($port, $port['ifIndex'].'. '.$port['label'])." $error_img $mac
     </span><br /><span class=interface-desc>".$port['ifAlias'].'</span>';
+}
 
 if ($port['ifAlias']) {
     echo '<br />';
diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index 56e4b28ebf..66426e0835 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -452,7 +452,6 @@ $os = 'nos';
 $config['os'][$os]['text']             = 'Brocade NOS';
 $config['os'][$os]['type']             = 'network';
 $config['os'][$os]['ifname']           = 1;
-$config['os'][$os]['descr_to_alias']   = 1;
 $config['os'][$os]['over'][0]['graph'] = 'device_bits';
 $config['os'][$os]['over'][0]['text']  = 'Device Traffic';
 $config['os'][$os]['over'][1]['graph'] = 'device_processor';
diff --git a/includes/discovery/mempools/nos.inc.php b/includes/discovery/mempools/nos.inc.php
new file mode 100644
index 0000000000..3b86224ecc
--- /dev/null
+++ b/includes/discovery/mempools/nos.inc.php
@@ -0,0 +1,15 @@
+<?php
+
+if ($device['os'] == "nos") {
+  echo("nos: ");
+
+  $used 	= snmp_get($device, "1.3.6.1.4.1.1588.2.1.1.1.26.6.0", "-Ovq");
+  $total 	= "100";
+  $free		= ($total - $used);
+
+  $percent	= $used; 
+
+  if (is_numeric($used)) {
+    discover_mempool($valid_mempool, $device, 0, "nos", "Memory", "1", NULL, NULL);
+  }
+}
\ No newline at end of file
diff --git a/includes/discovery/os/nos.inc.php b/includes/discovery/os/nos.inc.php
index d6f0ae58fe..7fd7646d64 100644
--- a/includes/discovery/os/nos.inc.php
+++ b/includes/discovery/os/nos.inc.php
@@ -1,7 +1,7 @@
 <?php
 
 if (!$os) {
-    if (strstr($sysObjectId, '.1.3.6.1.4.1.1588.2.2.1.1.1.5') || stristr($sysDescr, 'Brocade Communications Systems')) {
-        $os = 'nos';
+    if (strstr($sysDescr, "Brocade VDX")) { 
+        $os = "nos"; 
     }
 }
diff --git a/includes/discovery/processors/nos.inc.php b/includes/discovery/processors/nos.inc.php
new file mode 100644
index 0000000000..53bc6147a5
--- /dev/null
+++ b/includes/discovery/processors/nos.inc.php
@@ -0,0 +1,14 @@
+<?php
+
+if ($device['os'] == "nos") {
+  echo("nos : ");
+
+  $descr = "CPU";
+  $usage = snmp_get($device, "1.3.6.1.4.1.1588.2.1.1.1.26.1.0", "-Ovq");
+
+  if (is_numeric($usage)) {
+    discover_processor($valid['processor'], $device, "1.3.6.1.4.1.1588.2.1.1.1.26.1", "0", "nos", $descr, "1", $usage, NULL, NULL);
+  }
+}
+
+unset ($processors_array);
\ No newline at end of file
diff --git a/includes/polling/mempools/nos.inc.php b/includes/polling/mempools/nos.inc.php
new file mode 100644
index 0000000000..4188302630
--- /dev/null
+++ b/includes/polling/mempools/nos.inc.php
@@ -0,0 +1,7 @@
+<?php
+
+// Somewhat of an uggly hack since NOS doesn't support fetching total memory of the device over SNMP
+// Given OID returns usage in percent so we set total to 100 in order to get a proper graph
+$mempool['total'] 	= "100";
+$mempool['used'] 	= snmp_get($device, "1.3.6.1.4.1.1588.2.1.1.1.26.6.0", "-Ovq");
+$mempool['free'] 	= ($mempool['total'] - $mempool['used']); 
\ No newline at end of file
diff --git a/includes/polling/os/nos.inc.php b/includes/polling/os/nos.inc.php
index 74363298d0..bdf1702fee 100644
--- a/includes/polling/os/nos.inc.php
+++ b/includes/polling/os/nos.inc.php
@@ -1,6 +1,5 @@
 <?php
 
-// SNMPv2-MIB::sysDescr.0  Brocade VDX Switch.
-if (preg_match('/Brocade ([\s\d\w]+)/', $poll_device['sysDescr'], $hardware)) {
-    $hardware = $hardware[1];
-}
+$version      = trim(snmp_get($device, "1.3.6.1.4.1.1588.2.1.1.1.1.6.0", "-Ovq"),'"');
+$hardware     = trim(snmp_get($device, "ENTITY-MIB::entPhysicalDescr.1", "-Ovq"),'"');
+$serial       = trim(snmp_get($device, "1.3.6.1.2.1.47.1.1.1.1.11.1", "-Ovq"),'"');
\ No newline at end of file
diff --git a/includes/polling/ports.inc.php b/includes/polling/ports.inc.php
index 01a8e09aa1..d9e1da4a21 100644
--- a/includes/polling/ports.inc.php
+++ b/includes/polling/ports.inc.php
@@ -333,7 +333,7 @@ foreach ($ports as $port) {
         echo 'VLAN == '.$this_port['ifVlan'];
 
 	// When devices do not provide ifAlias data, populate with ifDescr data if configured
-        if (($this_port['ifAlias'] == '' || $this_port['ifAlias'] == NULL) || $config['os'][$device['os']]['descr_to_alias'] == 1) {
+        if (($this_port['ifAlias'] == '' || $this_port['ifAlias'] == NULL) {
             $this_port['ifAlias'] = $this_port['ifDescr'];
             d_echo('Using ifDescr as ifAlias');
         }
diff --git a/includes/polling/processors/nos.inc.php b/includes/polling/processors/nos.inc.php
new file mode 100644
index 0000000000..158ad3ce9b
--- /dev/null
+++ b/includes/polling/processors/nos.inc.php
@@ -0,0 +1,3 @@
+<?php
+
+$proc = trim(snmp_get($device, "1.3.6.1.4.1.1588.2.1.1.1.26.1.0", "-Ovq"),'"');
\ No newline at end of file