diff --git a/content/fan-noise.md b/content/fan-noise.md
new file mode 100644
index 0000000000..bb83bf05d6
--- /dev/null
+++ b/content/fan-noise.md
@@ -0,0 +1,36 @@
+---
+title: System Fan Noise and Expectactions
+description: >
+  Ways to manage fan noise and design constraints.
+keywords:
+  - Fans
+  - Loud
+
+facebookImage: /_social/article
+twitterImage: /_social/article
+
+hidden: false
+section: software
+tableOfContents: true
+---
+
+## Noise Levels
+
+System76 sets custom fan curves for laptops to maximize their performance while minimizing fan noise. Current firmware keeps the fan off until 65°C and will ramp the fan speeds to max speed by 90°C.
+
+### Monitoring Fan Speeds
+
+Fan Speeds can be monitored with <u>psensor</u>, which can be installed from either the <u>Pop!_Shop</u> or the <u>Ubuntu Software</u> applications. Below is an example from a Oryx Pro (the number of cores/threads/GPU present will be different depending on the system).
+
+![psensor on an oryp7](/images/fan-noise/psensor-oryp7.png)
+
+### Fan Modes
+
+Our [Open Firmware laptops](/articles/open-firmware-systems) have fan controls to swap between max or automatic thermal control. Use Fn+1 to toggle between the modes. (Your model will show support on the key section of their [tech-docs](https://tech-docs.system76.com)).
+
+### Easy settings to effect fan noise
+
+Fan speed is based on thermal output of the system. There are some settings that will indirectly limit how much heat is created during use:
+
+1. Run the laptop while on battery: This will limit power consumption for the CPU and GPU and will lower thermal output.
+2. Set the laptop to Battery Life mode in either Power Profiles in the system menu or using `system76-power`. This limits the CPU's boost frequency, a side effect is to also limit how much heat is created.
diff --git a/content/open-firmware-systems.md b/content/open-firmware-systems.md
index 92a8520246..2514d1868c 100644
--- a/content/open-firmware-systems.md
+++ b/content/open-firmware-systems.md
@@ -37,23 +37,23 @@ The source code for our Open EC can be found [here](https://github.com/system76/
 
 | System | Open Firmware | Open EC |
 |:------:|:-------------:|:-------:|
-| addw2  | Yes\*         | Yes\*   |
-| bonw14 | Yes           | Yes     |
-| darp8  | Yes           | Yes     |
-| darp7  | Yes           | Yes     |
-| darp6  | Yes           | Yes\*   |
-| galp6  | Yes           | Yes     |
-| galp5  | Yes           | Yes     |
-| galp4  | Yes           | No      |
-| gaze17 | Yes           | Yes     |
-| gaze16 | Yes           | Yes     |
-| gaze15 | Yes\*         | Yes\*   |
-| lemp11 | Yes           | Yes     |
-| lemp10 | Yes           | Yes     |
-| lemp9  | Yes           | Yes     |
-| oryp9  | Yes           | Yes     |
-| oryp8  | Yes           | Yes     |
-| oryp7  | Yes           | Yes     |
-| oryp6  | Yes           | Yes     |
+| Adder WS (addw1) | No | No |
+| Adder WS (addw2) | Yes\* | Yes\* |
+| Adder WS (addw3 and newer) | Yes | Yes |
+| Bonobo WS (bonw13 and older) | No | No |
+| Bonobo WS (bonw14 and newer) | Yes | Yes |
+| Darter Pro (darp5 and older) | No  | No |
+| Darter Pro (darp6) | Yes  | Yes\* |
+| Darter Pro (darp7 and newer) | Yes | Yes |
+| Galago Pro (galp3 and older) | No | No |
+| Galago Pro (galp4) | Yes | No |
+| Galago Pro (galp5 and newer) | Yes | Yes |
+| Gazelle (gaze14 and older) | No | No |
+| Gazelle (gaze15) | Yes\* | Yes\* |
+| Gazelle (gaze16 and newer) | Yes | Yes |
+| Lemur Pro (lemp8 and older) | No | No |
+| Lemur Pro (lemp9 and newer) | Yes | Yes |
+| Oryx Pro (oryp5 and older) | No | No |
+| Oryx Pro (oryp6 and newer) | Yes | Yes |
 
 \* These models shipped with closed firmware/EC, but have since been updated to Open Firmware/EC. [This article](/articles/transition-firmware) can be used to move your system from closed to Open Firmware/EC.
diff --git a/static/images/fan-noise/psensor-oryp7.png b/static/images/fan-noise/psensor-oryp7.png
new file mode 100644
index 0000000000..44b6c3f678
Binary files /dev/null and b/static/images/fan-noise/psensor-oryp7.png differ