diff --git a/chapter-hsms/chapter.tex b/chapter-hsms/chapter.tex
index 8bd6428..abd43c4 100644
--- a/chapter-hsms/chapter.tex
+++ b/chapter-hsms/chapter.tex
@@ -229,18 +229,21 @@ meshes.
 \subsection{Sample Selection}
 
 Given their niche applications and high cost, devices incorporating tamper sensing meshes tend to be hard to find. For
-this survey, we chose 21 different models of card payment terminals, and 6 other devices. All devices were procured from
-ebay, and the majority were sold by electronic waste recycling companies. A complete list of our samples can be found in
-Table~\ref{tab_hsm_survey_sample_list}. Photos of each device are shown in Figure~\ref{fig_hsm_survey_sample_pics}. 
+this survey, we chose 30 total devices including 23 different models of card payment terminals, and 7 other devices.
+Some devices were procured by dumpster diving, while most were sourced from ebay. The majority of these were sold by
+electronic waste recycling companies. A complete list of our samples can be found in
+Table~\ref{tab_hsm_survey_sample_list}. External photos of each device are shown in
+Figure~\ref{fig_hsm_survey_sample_pics} and internal photos are shown in
+Figure~\ref{fig_hsm_survey_sample_internal_pics}. 
 
 \begin{table}
     \footnotesize
     \rowcolors{2}{gray!15}{white}
-    \begin{tabular}[c]{c>{\RaggedRight\arraybackslash}p{35mm}>{\RaggedRight\arraybackslash}p{30mm}llc}
+    \begin{tabular}[c]{c>{\RaggedRight\arraybackslash}p{20mm}>{\RaggedRight\arraybackslash}p{30mm}llc}
         \textbf{ID} & \textbf{Device} & \textbf{Manufacturer} &  \textbf{Type code} & \textbf{Year} \\
         \hline
         H01 & PED & Verifone & VX 570 & ca. 2010 \\ 
-        H02 & Slot machine CPU & Merkur / ADP Gauselmann & Sam 12 EC2 & ca. 2012 \\ 
+        H02 & Slot machine CPU module & Merkur / ADP Gauselmann & Sam 12 EC2 & ca. 2012 \\ 
         H03 & EPP & Sagem & USA1315-4240 R1A & 2014 \\ 
         H04 & EPP & Sagem & USA1316-5120 R1A & 2007 \\ 
         H05 & PED & Xac & xAPT-103 & 2014 \\ 
@@ -267,9 +270,13 @@ Table~\ref{tab_hsm_survey_sample_list}. Photos of each device are shown in Figur
         H28 & EPP & NCR & 5814 UEPP & 2019 \\ 
         H29 & HSM & SafeNet & VBD-05 & 2018 \\ 
         H30 & HSM & Irdeto & Mayflower-IDX/C201 & 2011 \\ 
+        H31 & PED & SumUp & SumUp 3G & 2019 \\ 
+        H32 & PED & SumUp & SumUp Air & 2022 \\ 
     \end{tabular}
+    \caption{The samples we dissected in our survey. PED stands for \emph{Pin Entry Device}, the industry term for card
+        payment terminals that have sufficient security to handle credit card PINs. EPP stands for \emph{Encrypting Pin
+        Pad}, the type of keypad used for pin entry on ATMs. HSM stands for Hardware Security Module.}
     \label{tab_hsm_survey_sample_list}
-    \caption{The samples we dissected in our survey.}
 \end{table}
 
 \newcommand{\surveypic}[2]{
@@ -310,9 +317,51 @@ Table~\ref{tab_hsm_survey_sample_list}. Photos of each device are shown in Figur
         \surveypic{28}{survey_diag_S28.jpg}&
         \surveypic{29}{survey_diag_S29.jpg}&
         \surveypic{30}{survey_diag_S30.jpg}&
+        \surveypic{30}{survey_diag_S31.jpg}\\
+        \surveypic{30}{survey_diag_S32.jpg}&
     \end{tabular}
+    \caption{External photos of all survey samples}
     \label{fig_hsm_survey_sample_pics}
-    \caption{Photos of all survey samples}
+\end{figure}
+
+\begin{figure}
+    \begin{tabular}[c]{cccc}
+        \surveypic{01}{survey_internal_09_S01.jpg}&
+        \surveypic{02}{survey_internal_20_S02.jpg}&
+        \surveypic{03}{survey_internal_11_S03.jpg}&
+        \surveypic{04}{survey_internal_03_S04.jpg}\\
+        \surveypic{05}{survey_internal_10_S05.jpg}&
+        \surveypic{06}{survey_internal_08_S06.jpg}&
+        \surveypic{08}{survey_internal_24_S08.jpg}&
+        \surveypic{09}{survey_internal_13_S09.jpg}\\
+        \surveypic{10}{survey_internal_23_S10.jpg}&
+        \surveypic{11}{survey_internal_17_S11.jpg}&
+        \surveypic{12}{survey_internal_19_S12.jpg}&
+        \surveypic{13}{survey_internal_02_S13.jpg}\\
+        \surveypic{14}{survey_internal_00_S14.jpg}&
+        \surveypic{14}{survey_internal_01_S14.jpg}&
+        \surveypic{15}{survey_internal_04_S15.jpg}&
+        \surveypic{16}{survey_internal_05_S16.jpg}\\
+        \surveypic{17}{survey_internal_22_S17.jpg}&
+        \surveypic{18}{survey_internal_21_S18.jpg}&
+        \surveypic{19}{survey_internal_26_S19.jpg}&
+        \surveypic{20}{survey_internal_12_S20.jpg}\\
+        \surveypic{21}{survey_internal_15_S21.jpg}&
+        \surveypic{22}{survey_internal_16_S22.jpg}&
+        \surveypic{23}{survey_internal_07_S23.jpg}&
+        \surveypic{24}{survey_internal_06_S24.jpg}\\
+        \surveypic{25}{survey_internal_25_S25.jpg}&
+        \surveypic{27}{survey_internal_18_S27.jpg}&
+        \surveypic{28}{survey_internal_14_S28.jpg}&
+        \surveypic{30}{survey_internal_29_S30.jpg}\\
+        \surveypic{31}{survey_internal_27_S31.jpg}&
+        \surveypic{32}{survey_internal_28_S32.jpg}&
+        % make sure the last row with a single dangling landscape picture is full height to avoid the last row's label
+        % overlapping the previous row
+        \rule{0pt}{25mm}
+    \end{tabular}
+    \caption{Internal overview photos of the survey samples}
+    \label{fig_hsm_survey_sample_internal_pics}
 \end{figure}
 
 \subsubsection{Card Payment Terminals}
diff --git a/chapter-hsms/figures/survey_diag_S31.jpg b/chapter-hsms/figures/survey_diag_S31.jpg
new file mode 100644
index 0000000..a417ec9
Binary files /dev/null and b/chapter-hsms/figures/survey_diag_S31.jpg differ
diff --git a/chapter-hsms/figures/survey_diag_S32.jpg b/chapter-hsms/figures/survey_diag_S32.jpg
new file mode 100644
index 0000000..cf405c4
Binary files /dev/null and b/chapter-hsms/figures/survey_diag_S32.jpg differ
diff --git a/chapter-hsms/figures/survey_internal_00_S14.jpg b/chapter-hsms/figures/survey_internal_00_S14.jpg
new file mode 100644
index 0000000..c6c139e
Binary files /dev/null and b/chapter-hsms/figures/survey_internal_00_S14.jpg differ
diff --git a/chapter-hsms/figures/survey_internal_01_S14.jpg b/chapter-hsms/figures/survey_internal_01_S14.jpg
new file mode 100644
index 0000000..b570a51
Binary files /dev/null and b/chapter-hsms/figures/survey_internal_01_S14.jpg differ
diff --git a/chapter-hsms/figures/survey_internal_02_S13.jpg b/chapter-hsms/figures/survey_internal_02_S13.jpg
new file mode 100644
index 0000000..937522a
Binary files /dev/null and b/chapter-hsms/figures/survey_internal_02_S13.jpg differ
diff --git a/chapter-hsms/figures/survey_internal_03_S04.jpg b/chapter-hsms/figures/survey_internal_03_S04.jpg
new file mode 100644
index 0000000..fa5ab4f
Binary files /dev/null and b/chapter-hsms/figures/survey_internal_03_S04.jpg differ
diff --git a/chapter-hsms/figures/survey_internal_04_S15.jpg b/chapter-hsms/figures/survey_internal_04_S15.jpg
new file mode 100644
index 0000000..e6ce4d5
Binary files /dev/null and b/chapter-hsms/figures/survey_internal_04_S15.jpg differ
diff --git a/chapter-hsms/figures/survey_internal_05_S16.jpg b/chapter-hsms/figures/survey_internal_05_S16.jpg
new file mode 100644
index 0000000..11c10ae
Binary files /dev/null and b/chapter-hsms/figures/survey_internal_05_S16.jpg differ
diff --git a/chapter-hsms/figures/survey_internal_06_S24.jpg b/chapter-hsms/figures/survey_internal_06_S24.jpg
new file mode 100644
index 0000000..bb85be7
Binary files /dev/null and b/chapter-hsms/figures/survey_internal_06_S24.jpg differ
diff --git a/chapter-hsms/figures/survey_internal_07_S23.jpg b/chapter-hsms/figures/survey_internal_07_S23.jpg
new file mode 100644
index 0000000..c764214
Binary files /dev/null and b/chapter-hsms/figures/survey_internal_07_S23.jpg differ
diff --git a/chapter-hsms/figures/survey_internal_08_S06.jpg b/chapter-hsms/figures/survey_internal_08_S06.jpg
new file mode 100644
index 0000000..9251092
Binary files /dev/null and b/chapter-hsms/figures/survey_internal_08_S06.jpg differ
diff --git a/chapter-hsms/figures/survey_internal_09_S01.jpg b/chapter-hsms/figures/survey_internal_09_S01.jpg
new file mode 100644
index 0000000..a239889
Binary files /dev/null and b/chapter-hsms/figures/survey_internal_09_S01.jpg differ
diff --git a/chapter-hsms/figures/survey_internal_10_S05.jpg b/chapter-hsms/figures/survey_internal_10_S05.jpg
new file mode 100644
index 0000000..51d28b4
Binary files /dev/null and b/chapter-hsms/figures/survey_internal_10_S05.jpg differ
diff --git a/chapter-hsms/figures/survey_internal_11_S03.jpg b/chapter-hsms/figures/survey_internal_11_S03.jpg
new file mode 100644
index 0000000..cde04ea
Binary files /dev/null and b/chapter-hsms/figures/survey_internal_11_S03.jpg differ
diff --git a/chapter-hsms/figures/survey_internal_12_S20.jpg b/chapter-hsms/figures/survey_internal_12_S20.jpg
new file mode 100644
index 0000000..2aa8217
Binary files /dev/null and b/chapter-hsms/figures/survey_internal_12_S20.jpg differ
diff --git a/chapter-hsms/figures/survey_internal_13_S09.jpg b/chapter-hsms/figures/survey_internal_13_S09.jpg
new file mode 100644
index 0000000..79ff771
Binary files /dev/null and b/chapter-hsms/figures/survey_internal_13_S09.jpg differ
diff --git a/chapter-hsms/figures/survey_internal_14_S28.jpg b/chapter-hsms/figures/survey_internal_14_S28.jpg
new file mode 100644
index 0000000..8eb6937
Binary files /dev/null and b/chapter-hsms/figures/survey_internal_14_S28.jpg differ
diff --git a/chapter-hsms/figures/survey_internal_15_S21.jpg b/chapter-hsms/figures/survey_internal_15_S21.jpg
new file mode 100644
index 0000000..2951da3
Binary files /dev/null and b/chapter-hsms/figures/survey_internal_15_S21.jpg differ
diff --git a/chapter-hsms/figures/survey_internal_16_S22.jpg b/chapter-hsms/figures/survey_internal_16_S22.jpg
new file mode 100644
index 0000000..e09d2dd
Binary files /dev/null and b/chapter-hsms/figures/survey_internal_16_S22.jpg differ
diff --git a/chapter-hsms/figures/survey_internal_17_S11.jpg b/chapter-hsms/figures/survey_internal_17_S11.jpg
new file mode 100644
index 0000000..bc25d20
Binary files /dev/null and b/chapter-hsms/figures/survey_internal_17_S11.jpg differ
diff --git a/chapter-hsms/figures/survey_internal_18_S27.jpg b/chapter-hsms/figures/survey_internal_18_S27.jpg
new file mode 100644
index 0000000..53ebb6e
Binary files /dev/null and b/chapter-hsms/figures/survey_internal_18_S27.jpg differ
diff --git a/chapter-hsms/figures/survey_internal_19_S12.jpg b/chapter-hsms/figures/survey_internal_19_S12.jpg
new file mode 100644
index 0000000..0761b7d
Binary files /dev/null and b/chapter-hsms/figures/survey_internal_19_S12.jpg differ
diff --git a/chapter-hsms/figures/survey_internal_20_S02.jpg b/chapter-hsms/figures/survey_internal_20_S02.jpg
new file mode 100644
index 0000000..99376a5
Binary files /dev/null and b/chapter-hsms/figures/survey_internal_20_S02.jpg differ
diff --git a/chapter-hsms/figures/survey_internal_21_S18.jpg b/chapter-hsms/figures/survey_internal_21_S18.jpg
new file mode 100644
index 0000000..0aa469b
Binary files /dev/null and b/chapter-hsms/figures/survey_internal_21_S18.jpg differ
diff --git a/chapter-hsms/figures/survey_internal_22_S17.jpg b/chapter-hsms/figures/survey_internal_22_S17.jpg
new file mode 100644
index 0000000..8d7e799
Binary files /dev/null and b/chapter-hsms/figures/survey_internal_22_S17.jpg differ
diff --git a/chapter-hsms/figures/survey_internal_23_S10.jpg b/chapter-hsms/figures/survey_internal_23_S10.jpg
new file mode 100644
index 0000000..ac2cc70
Binary files /dev/null and b/chapter-hsms/figures/survey_internal_23_S10.jpg differ
diff --git a/chapter-hsms/figures/survey_internal_24_S08.jpg b/chapter-hsms/figures/survey_internal_24_S08.jpg
new file mode 100644
index 0000000..ab35c0e
Binary files /dev/null and b/chapter-hsms/figures/survey_internal_24_S08.jpg differ
diff --git a/chapter-hsms/figures/survey_internal_25_S25.jpg b/chapter-hsms/figures/survey_internal_25_S25.jpg
new file mode 100644
index 0000000..aea297c
Binary files /dev/null and b/chapter-hsms/figures/survey_internal_25_S25.jpg differ
diff --git a/chapter-hsms/figures/survey_internal_26_S19.jpg b/chapter-hsms/figures/survey_internal_26_S19.jpg
new file mode 100644
index 0000000..c660ca2
Binary files /dev/null and b/chapter-hsms/figures/survey_internal_26_S19.jpg differ
diff --git a/chapter-hsms/figures/survey_internal_27_S31.jpg b/chapter-hsms/figures/survey_internal_27_S31.jpg
new file mode 100644
index 0000000..0f241a2
Binary files /dev/null and b/chapter-hsms/figures/survey_internal_27_S31.jpg differ
diff --git a/chapter-hsms/figures/survey_internal_28_S32.jpg b/chapter-hsms/figures/survey_internal_28_S32.jpg
new file mode 100644
index 0000000..37bba17
Binary files /dev/null and b/chapter-hsms/figures/survey_internal_28_S32.jpg differ
diff --git a/chapter-hsms/figures/survey_internal_29_S30.jpg b/chapter-hsms/figures/survey_internal_29_S30.jpg
new file mode 100644
index 0000000..bd4ec39
Binary files /dev/null and b/chapter-hsms/figures/survey_internal_29_S30.jpg differ