diff --git a/esc/esc_programming.tex b/esc/esc_programming.tex
index 0cade996513ef5d1ab89b58168b9b3c728f7124c..105a1656b1fa78894eb8d970d0219cee664f65f8 100644
--- a/esc/esc_programming.tex
+++ b/esc/esc_programming.tex
@@ -95,20 +95,33 @@ being ejected from the housing or being caught up by the motor shaft.
 
 
 \section{Telemetry}
-The \jetibox can be used as a telemetry system during normal operation of the
-motor. While this should not be used when the model is in the wind
-tunnel\footnote{Not really needed/useful and not enough space to put the
-\jetibox inside the fuselage.}, the telemetry could provide valuable insight
-during the first programming steps of the ESC.
+
+The \jetibox can be used as a telemetry terminal for post-run analysis or even
+during \textit{live} operation of the motor. It is recommended to prefer the
+post-run telemetry rather than the live mode for safety reasons. In principle,
+the live mode should be reserved for initial settings of the ESC on a test
+bench. \textbf{Never do live telemetry on a fully working (flapping) system}.
+
 
 \subsection{Safety procedure}
-The telemetry can be used to get direct measurements on the operating motor.
-\textbf{This is the most dangerous way of operation} as it requires both the
-motor to be running and the operator to stand close to the system. To ensure
-maximal safety, this should be reserved for analysing the motor in isolation on
-a test bench, not integrated in the \MR.
+For post-run analysis, the ESC can be completely disconnected from the Arduino.
+This will ensure that the \jetibox remains in Telemetry mode and the motors will
+not accidentally start.
+
+For post-run mode, the safety procedure is:
+\begin{enumerate}
+  \item Disconnect the ESC from the Arduino completely, or completely unplug the
+    Arduino.
+\end{enumerate}
+
 
-The following safety procedure should be observed for use in telemetry mode:
+The telemetry can also be used to obtain direct measurements on the operating
+motor. \textbf{This is the most dangerous way of operation} as it requires both
+the motor to be running and the operator to stand close to the system (to read
+the measurements). To ensure maximal safety, this should be reserved for
+analysing the motor in isolation on a test bench, not integrated in the \MR.
+
+The following safety procedure should be observed for use in live mode:
 \begin{enumerate}
   \item Unmount the motor from the \MR and secure it to a test rig (a vice);
   \item Ensure the surroundings are clear of any loose object that may come
@@ -117,8 +130,6 @@ The following safety procedure should be observed for use in telemetry mode:
     not aligned with the motor lateral direction.
 \end{enumerate}
 
-It is also possible to plug the \jetibox to the ESC after a run is complete. In
-that case, the last motor run can be recovered and analyzed properly.
 
 \subsection{Telemetry procedure}
 To begin a test run using the \jetibox for telemetry:
@@ -127,11 +138,12 @@ To begin a test run using the \jetibox for telemetry:
   \item Ensure the safety precautions are all conducted.
   \item Connect the \jetibox to the ESC.
   \item Turn on the power supply.
-  \item Turn on the Arduino.
-  \item Operate the motor as usual.
+  \item Turn on the Arduino (\textit{for live mode only}).
+  \item Operate the motor as usual (\textit{for live mode only}).
 \end{enumerate}
-The same procedure can be applied for \textit{live} telemetry or after-run
-analysis.
+
+For the post-run telemetry, the two last points are not relevant as the Arduino
+should be unplugged or at least disconnected from the ESC.
 
 \section{ESC settings modifications}
 This section concerns the modifications of the ESC settings using the \jetibox.