diff --git a/pages/AshburnPoP.md b/pages/AshburnPoP.md
index e6863d5..25de56d 100644
--- a/pages/AshburnPoP.md
+++ b/pages/AshburnPoP.md
@@ -70,6 +70,7 @@ Ports: 11/12 (these were new ports)
## Equipment
* sw0 is a Cisco WS-C3750G-24PS
+* sw1 is a Cisco Nexus C3064PQ
* o0 is a Cisco 2621 (MPC860) processor (revision 0x102) w/ 61440K/4096K
* r0 is a Dell 630 running FRR
* r1 is a Dell 630 running FRR
@@ -80,24 +81,25 @@ Ports: 11/12 (these were new ports)
| hostname | switch | oob | oobname | pwr | RU | |
| :-------------------- | ------------- | ----- | ------- | --------| ---- | ------------------------- |
-| r1.iad.rg.net | s0.5 3 | o0.36 | r1 | 0.1 1.1 | ???? | Dell 630/FRR |
-| r0.iad.rg.net | s0.24 23 11 | o0.33 | r0 | 0.2 1.3 | | Dell R630 6TKCMN2 |
-| fiber patch panel | | | | | 5-6 | (equinix) |
-| vm0.iad.rg.net | s0.02 s0.14 | o0.XX | vm0 | 0.6 | 3 | SuperMicro SYS-6016T-URF |
+| r0.iad.rg.net | s0.24 s0.11 | o0.33 | r0 | 0.2 1.3 | | Dell R630 6TKCMN2 |
+| r1.iad.rg.net | s0.05 s0.03 | o0.36 | r1 | 0.1 1.1 | ???? | Dell 630/FRR |
+| vm0.iad.rg.net | s1.1&2 s0.14 | o0.42 | vm0 | 0.6 | 3 | SuperMicro SYS-6016T-URF |
+| vm1.iad.rg.net | s1.3&4 s0.12 | o0.37 | vm1 | 0.3 1.4 | | Dell R630 7WCXDH2 |
+| vm2.iad.rg.net | s1.5&6 s0.13 | o0.35 | vm2 | 0.4 1.2 | | Dell R630 GLY2W52 |
| o0.iad.rg.net | s0.01/02 | vm2.usb | | 1.6 | | Cisco 2621 (MPC860) |
-| sw0.iad.rg.net | | o0.37 | s0 | 0.5 | | Cisco WS-C3750G-24PS |
-| vm1.iad.rg.net | s0.06 16 12 | o0.38 | vm1 | 0.3 1.4 | | Dell R630 7WCXDH2 |
+| sw0.iad.rg.net | s1.48 | o0.45 | sw0 | 0.5 | | Cisco WS-C3750G-24PS |
+| sw1.iad.rg.net | s0.25 | o0.48 | sw1 | floor | | Cisco 3964 |
| pwr0.iad.rg.net | | o0.41 | pwr0 | equinix | | BayTech RPC |
| pwr1.iad.rg.net | | o0.43 | pwr1 | equinix | | BayTech RPC |
-| vm2.iad.rg.net | s0.07 sw0.13 | o0.35 | vm2 | 0.4 1.2 | | Dell R630 GLY2W52 |
+| fiber patch panel | | | | | 5-6 | (equinix) |
## Ethernet Ports
| hostname | main ether | ipmi | drbd |
| :--------------- | ---------- | ----- | ------- |
-| vm0.iad.rg.net | sw0.02 | sw0.14 | sw0.15 |
-| vm1.iad.rg.net | sw0.06 | sw0.12 | sw0.16 |
-| vm2.iad.rg.net | sw0.07 | sw0.13 | sw0.17 |
+| vm0.iad.rg.net | sw1.01 | sw0.14 | sw1.02 |
+| vm1.iad.rg.net | sw1.03 | sw0.12 | sw1.04 |
+| vm2.iad.rg.net | sw1.05 | sw0.13 | sw1.06 |
| hostname | main ether | ipmi |
| :--------------- | ---------- | ----- |
@@ -147,55 +149,28 @@ vm2.iad.rg.net:/root# qm list
| usbeacon2.iibex.auckland.ac.nz | 198.180.150.52 | Etuate Cocker <ecoc005@aucklanduni.ac.nz> |
-## New vm0.iad.rg.net
+## vm0.iad.rg.net proxmox
Dell R630
-Service Tag: 96YZ382
+Service Tag: 7WD2HH2
+Express Service Code: 17194344950
2x 12-Core 2.4 GHz Intel E5-2670v3
256GB DDR4 Memory
H730 Mini RAID controller
4 Gigabit RJ45 network ports
2 10Gb SFP+
iDRAC 8 Enterprise
+iDRAC MAC: 84:7B:EB:F5:54:48
Intel X520-SR2 2-Port 10G SFP+ Ethernet, PCI-e
-
-## vm0.iad.rg.net Hardware
-
-- [Supermicro SYS-6016T-URF with X8DTU-F mobo](http://www.supermicro.com/products/system/1U/6016/SYS-6016T-URF.cfm)
-- Power-A&B - UL24-3#24
-
-### vm0.iad.rg.net Disk Configuration
-```
-vm0.iad.rg.net:/root# tw_cli info c0
-
-Unit UnitType Status %RCmpl %V/I/M Stripe Size(GB) Cache AVrfy
-------------------------------------------------------------------------------
-u0 RAID-5 OK - - 256K 8381.87 RiW ON
-
-VPort Status Unit Size Type Phy Encl-Slot Model
-------------------------------------------------------------------------------
-p0 OK u0 3.63 TB SATA 0 - WDC WD4003FRYZ-01F0
-p1 OK u0 3.63 TB SATA 1 - WDC WD4003FRYZ-01F0
-p2 OK u0 3.63 TB SATA 2 - WDC WD4003FRYZ-01F0
-p3 OK u0 2.73 TB SATA 3 - HITACHI HUA723030AL
-```
-
-Four drive bays seem to be numbered 0-3 left to right
-
-From `for i in 0 1 2 3; do smartctl -a -d 3ware,$i /dev/twl0 | grep Serial; done`
+### vm1.iad.rg.net Disk Drives
| Unit | Model | Serial | |
| ---- | ----------------------- | --------------- | -------------------- |
-| 0 | WD4003FRYZ-01F0DB0 | VBHVEUTF | new as of 2023.05.17 |
-| 1 | WD4003FRYZ-01F0DB0 | V1JVGGHG | |
-| 2 | WD4003FRYZ-01F0DB0 | V1KW63UG | new as of 2023.08.09 |
-| 3 | HITACHI HUA723030ALA640 | YVHPV0LA | |
-
-* 2023.05.17 replaced p0 K7G9TG6L with VBHVEUTF
-* 2022.05.18 replaced p1 WDC WD3000FYYZ-01UL serial WD-WCC130121922
-* 2023.08.09 replaced p2 WD3000FYYZ-01UL1B0 WD-WCC130095709
-
+| 0 | Samsung SSD 870 EVO 4TB | S758NX0X504363Z | new as of 2025.10.16 |
+| 1 | Samsung SSD 870 EVO 4TB | S758NX0X504346A | new as of 2025.10.16 |
+| 2 | Samsung SSD 870 EVO 4TB | S758NX0X504359A | new as of 2025.10.16 |
+| 3 | Samsung SSD 870 EVO 4TB | S758NX0X504345N | new as of 2025.10.16 |
## vm1.iad.rg.net proxmox
@@ -421,5 +396,41 @@ Fan Tray 0 REV 01 710-021113 XB1539 MX240 Fan Tray
| emu.machshav.com | s0.08 | o0.40 | emu | 0.2 | | Steven M Bellovin <smb@cs.columbia.edu> |
| emu-2.machshav.com | s0.09/10 | | | | | Steven M Bellovin <smb@cs.columbia.edu> |
+## vm0.iad.rg.net Hardware Decommissioned
+
+- [Supermicro SYS-6016T-URF with X8DTU-F mobo](http://www.supermicro.com/products/system/1U/6016/SYS-6016T-URF.cfm)
+- Power-A&B - UL24-3#24
+
+### vm0.iad.rg.net Disk Configuration
+```
+vm0.iad.rg.net:/root# tw_cli info c0
+
+Unit UnitType Status %RCmpl %V/I/M Stripe Size(GB) Cache AVrfy
+------------------------------------------------------------------------------
+u0 RAID-5 OK - - 256K 8381.87 RiW ON
+
+VPort Status Unit Size Type Phy Encl-Slot Model
+------------------------------------------------------------------------------
+p0 OK u0 3.63 TB SATA 0 - WDC WD4003FRYZ-01F0
+p1 OK u0 3.63 TB SATA 1 - WDC WD4003FRYZ-01F0
+p2 OK u0 3.63 TB SATA 2 - WDC WD4003FRYZ-01F0
+p3 OK u0 2.73 TB SATA 3 - HITACHI HUA723030AL
+```
+
+Four drive bays seem to be numbered 0-3 left to right
+
+From `for i in 0 1 2 3; do smartctl -a -d 3ware,$i /dev/twl0 | grep Serial; done`
+
+| Unit | Model | Serial | |
+| ---- | ----------------------- | --------------- | -------------------- |
+| 0 | WD4003FRYZ-01F0DB0 | VBHVEUTF | new as of 2023.05.17 |
+| 1 | WD4003FRYZ-01F0DB0 | V1JVGGHG | |
+| 2 | WD4003FRYZ-01F0DB0 | V1KW63UG | new as of 2023.08.09 |
+| 3 | HITACHI HUA723030ALA640 | YVHPV0LA | |
+
+* 2023.05.17 replaced p0 K7G9TG6L with VBHVEUTF
+* 2022.05.18 replaced p1 WDC WD3000FYYZ-01UL serial WD-WCC130121922
+* 2023.08.09 replaced p2 WD3000FYYZ-01UL1B0 WD-WCC130095709
+
---
-2025.08.25
\ No newline at end of file
+2025.10.16
\ No newline at end of file