diff --git a/common/modules/under-the-hood-pictures.org b/common/modules/under-the-hood-pictures.org
index 77bea8f..727ed09 100644
--- a/common/modules/under-the-hood-pictures.org
+++ b/common/modules/under-the-hood-pictures.org
@@ -1,49 +1,81 @@
 #+COLUMNS: %40ITEM %10BEAMER_env(Env) %9BEAMER_envargs(Env Args) %10BEAMER_act(Act) %4BEAMER_col(Col) %10BEAMER_extra(Extra) %8BEAMER_opt(Opt)
 #+INCLUDE: "prelude.org" :minlevel 1
 * Under the hood: architecture and data structure
   :PROPERTIES:
   :CUSTOM_ID: main
   :END:
 ** Under the hood: Automation, and storage
   :PROPERTIES:
   :CUSTOM_ID: automation
   :END:
    #+BEAMER: \begin{center}
    #+BEAMER:   \mode<beamer>{\only<1>{\includegraphics[width=\extblockscale{\textwidth}]{swh-dataflow-merkle-listers.pdf}}}
    #+BEAMER:   \only<2-3>{\includegraphics[width=\extblockscale{\textwidth}]{swh-dataflow-merkle.pdf}}
    #+BEAMER: \end{center}
    #+BEAMER: \pause
    #+BEAMER: \pause
    /Global development history/ *permanently archived* in a *uniform data model*
    - over *12 billion* unique source files from over *180 million* software projects
    - *~1PB* (uncompressed) blobs, *~25 B* nodes, *~350 B* edges
+** Under the hood: listers and loaders
+  :PROPERTIES:
+  :CUSTOM_ID: listersloaders
+  :END:
+*** Supported listers ([[https://docs.softwareheritage.org/user/listers/index.html][index]])
+    :PROPERTIES:
+    :BEAMER_env: block
+    :BEAMER_COL: .5
+    :END:
+   #+LATEX: \begin{center}
+   #+LATEX:   \includegraphics[width=\linewidth]{indexoflisters.png}
+   #+LATEX: \end{center}
+*** Supported loaders ([[https://docs.softwareheritage.org/user/loaders/index.html][index]])
+    :PROPERTIES:
+    :BEAMER_env: block
+    :BEAMER_COL: .5
+    :END:
+   #+LATEX: \begin{center}
+   #+LATEX:   \includegraphics[width=\linewidth]{indexofloaders.png}
+   #+LATEX: \end{center}
+***                                                         :B_ignoreheading:
+    :PROPERTIES:
+    :BEAMER_env: ignoreheading
+    :END:
+*** Many contributed from external experts
+    Thanks to support of Alfred P. Sloan and NLNet foundations
 ** Much more than an archive!
+  :PROPERTIES:
+  :CUSTOM_ID: merkle
+  :END:
    # R. C. Merkle, A digital signature based on a conventional encryption
    # function, Crypto '87
    #+BEAMER: \vspace{-3mm}
 ***** Merkle tree (R. C. Merkle, Crypto 1979)                    :B_picblock:
       :PROPERTIES:
       :BEAMER_opt: pic=merkle, leftpic=true, width=.7\linewidth
       :BEAMER_env: picblock
       :BEAMER_act:
       :END:
       Combination of
        - tree
        - hash function
 ***** Classical cryptographic construction
       - fast, parallel signature of large data structures
       - widely used (e.g., Git, blockchains, IPFS, ...)
       - *built-in deduplication*
 ** The archive in pictures
+  :PROPERTIES:
+  :CUSTOM_ID: merkleanimation
+  :END:
     #+LATEX: \centering\forcebeamerstart
     #+LATEX: \only<1>{\colorbox{white}{\includegraphics[width=\extblockscale{\linewidth}]{git-merkle/merkle_1.pdf}}}
     #+LATEX: \only<2>{\colorbox{white}{\includegraphics[width=\extblockscale{\linewidth}]{git-merkle/contents.pdf}}}
     #+LATEX: \only<3>{\colorbox{white}{\includegraphics[width=\extblockscale{\linewidth}]{git-merkle/merkle_2_contents.pdf}}}
     #+LATEX: \only<4>{\colorbox{white}{\includegraphics[width=\extblockscale{\linewidth}]{git-merkle/directories.pdf}}}
     #+LATEX: \only<5>{\colorbox{white}{\includegraphics[width=\extblockscale{\linewidth}]{git-merkle/merkle_3_directories.pdf}}}
     #+LATEX: \only<6>{\colorbox{white}{\includegraphics[width=\extblockscale{\linewidth}]{git-merkle/revisions.pdf}}}
     #+LATEX: \only<7>{\colorbox{white}{\includegraphics[width=\extblockscale{\linewidth}]{git-merkle/merkle_4_revisions.pdf}}}
     #+LATEX: \only<8>{\colorbox{white}{\includegraphics[width=\extblockscale{\linewidth}]{git-merkle/releases.pdf}}}
     #+LATEX: \only<9>{\colorbox{white}{\includegraphics[width=\extblockscale{\linewidth}]{git-merkle/merkle_5_releases.pdf}}}
     #+LATEX: \only<10>{\colorbox{white}{\includegraphics[width=\extblockscale{\linewidth}]{git-merkle/snapshots.pdf}}}
     #+LATEX: \forcebeamerend