diff --git a/Sonoff-S31.md b/Sonoff-S31.md
index 840bfdab..529e87cf 100644
--- a/Sonoff-S31.md
+++ b/Sonoff-S31.md
@@ -1,16 +1,13 @@
-## See Sonoff Pow/Pow2 page
+⚠️️️ **Do not connect AC power and the serial connection at the same time** ️️️⚠️️️
 
-## ⚠️️Special Attention   ⚠️️
-
-**Do not connect AC power and the serial connection at the same time** 
-The Gnd connection of the S31 is connected to the live AC wire. Connecting serial with your PC will fry your PC and will electrocute you. 
+The GND connection of the S31 is connected to the live AC wire. Connecting serial with your PC will fry your PC and will electrocute you. 
 
 **DO NOT CONNECT ANY SENSOR TO THESE DEVICES.** Only use them as designed. 
 
 **The GPIOs on this device are connected to AC power**, therefore it is not possible to safely add sensors or displays to it. 
 
-## Connection
-### The S31 is pretty easy to take apart.
+## Serial Flashing
+The S31 is pretty easy to take apart.
 1. Pry off the gray cover on the end.
 1. Slide off the two rounded corner pieces to reveal the 3 screws.
 1. Unscrew the 3 screws.
@@ -20,27 +17,9 @@ The Gnd connection of the S31 is connected to the live AC wire. Connecting seria
 1. Connect to your serial converter and 3V3.
 1. You need to press the switch (GPIO0) before applying power to put into bootloader mode.
 
-### Verify RX and TX (and VCC and GND) are correct
-1. Use a terminal program (TeraTerm, putty are examples)
-1. Set it to the COM port that shows up, when you plug in the USB serial adapter.
-1. Configure for 115,200 baud
-1. Connect all 4 pins to the S31
-1. You should see garbage text show up on the terminal
-1. If you don't, try reversing RX and TX
-1. Make sure your voltage is good
-1. If you don't see text (will be garbage, since the first text that shows up is at a very high baud rate) you are unlikely to be successful in later steps, so figure out why it isn't working now
+For exact energy monitoring you might need to [calibrate the device](power-monitoring-calibration).
 
-### Now comes the fun part
-1. It helps to have 4 hands (or have soldered pins on).
-1. You must press the switch (GPIO0 to gnd) before applying power to start the bootloader.
-1. You can connect all four wires (while still keeping the switch pressed), or leave all but power connected and then press the switch and then apply the power.
-1. Now that it is in boot loader mode, you can flash the firmware.
-1. Follow the instructions in the rest of the Wiki for the method you are using.
-
-## External Info on S31
-A link to someone's page about the internals of the S31 and how to flash another firmware. I have not yet tried this with Tasmota but will report back when I do.
-
-[S31 Page](http://tinkerman.cat/sonoff-s31-now-serious/)
+Tinkerman's review of [Sonoff S31](http://tinkerman.cat/sonoff-s31-now-serious/)
 
 ### Video tutorial by BK Hobby
 [![](http://img.youtube.com/vi/kKtLKjI4wA0/0.jpg)](http://www.youtube.com/watch?v=kKtLKjI4wA0 "")