Updates from Serge and some guesstimates

index.html

@@ -104,15 +104,13 @@ <h3>Faculty (and Labs)</h3>
 <li><a href="https://nebelwelt.net">Mathias Payer</a> (<a href="https://hexhive.epfl.ch">HexHive</a>)</li>
 <li><a href="https://carmelatroncoso.com/">Carmela Troncoso</a> (<a href="https://www.epfl.ch/labs/spring/">SPRING</a>)</li>
 <li><a href="https://lasec.epfl.ch/people/vaudenay/">Serge Vaudenay</a> (<a href="https://lasec.epfl.ch/">LASEC</a>)</li>
-* Note, JP Hubaux does not recruit PhD students nor postdocs anymore
+* Note, JP Hubaux does not recruit PhD students nor postdocs anymore.
 </ul>
 
 <h3>Postdocs and Researchers</h3> <!-- Ordered by last name, Research Scientists and Post Doctoral Scholars in IC speak -->
 <ul>
-<li>Ritam Bhaumik</li>
 <li>Marcel Busch</li> <!--HexHive-->
-<li>Vero Estrada</li>
-<li>Boris Tako Fouotsa</li>
+<li>Boris Tako Fouotsa</li> <!-- LASEC -->
 <li><a href="https://kavousniksirat.com/">Kavous Salehzadeh Niksirat</a></li>
 <li><a href="https://pasquini-dario.github.io/me/">Dario Pasquini</a></li>
 <li><a href="https://cyruscyliu.github.io/">Qiang Liu</a></li> <!--HexHive-->
@@ -121,8 +119,8 @@ <h3>Postdocs and Researchers</h3> <!-- Ordered by last name, Research Scientists
 
 <h3>Software Engineers</h3> <!-- Ordered by last name, Software Engineers in IC speak -->
 <ul>
-<li>Pierluca Borso&#768;</li>
-<li>Jean Viaene</li>
+<li>Pierluca Borso&#768;</li> <!-- DEDIS -->
+<li>Jean Viaene</li> <!-- DEDIS -->
 </ul>
 
 <h3>MSc Researchers</h3> <!-- Ordered by last name, MSc scholars in IC speak -->
@@ -137,39 +135,32 @@ <h3>MSc Researchers</h3> <!-- Ordered by last name, MSc scholars in IC speak -->
 <div class="col">
 <h3>PhD Students</h3> <!-- Ordered by last name, EDIC fellows, PhD students, and PhD candidates in IC speak -->
 <ul>
-<li>Ceyhun Alp</li>
 <li><a href="https://nicolasbadoux.com/">Nicolas Badoux</a></li> <!--HexHive-->
-<li>Khashayar Barooti</li>
-<li>Andrea Caforio</li>
-<li>Can Cebeci</li>
-<li><a href="https://lasec.epfl.ch/people/collins/">Daniel Collins</a></li>
-<li>Simone Colombo</li>
+<li>Can Cebeci</li> <!-- DSL -->
+<li>Keng-Yu Chen</li> <!-- LASEC -->
+<li>Simone Colombo</li> <!-- DEDIS -->
 <li><a href="https://cyanpencil.xyz/">Luca Di Bartolomeo</a></li> <!--HexHive-->
+<li>Max Duparc</li> <!-- LASEC -->
 <li><a href="https://kasra.edalat.dev/">Kasra EdalatNeadkhamene</a></li>
 <li>Zhiyao Feng</li> <!--HexHive-->
-<li>Aymeric Genet</li>
+<li>Lewis Glabush</li> <!-- LASEC -->
 <li>Florian Hofhammer</li> <!--HexHive-->
-<li>Lo&iuml;s Huguenin</li>
-<li><a href="https://dslab.epfl.ch/people/iyer/">Rishabh Iyer</a></li>
-<li>Klim Kireev</li>
-<li><a href="https://yugeshk.github.io">Yugesh Kothari</a></li>
-<li><a href="https://bogdankulynych.me/">Bogdan Kulynych</a></li>
-<li>Tao Lyu</li>
+<li><a href="https://dslab.epfl.ch/people/iyer/">Rishabh Iyer</a></li> <!-- DSL -->
+<li>Klim Kireev</li> <!-- SPRING -->
+<li><a href="https://yugeshk.github.io">Yugesh Kothari</a></li> <!-- DSL -->
+<li>Tao Lyu</li> <!-- RS3LAB -->
 <li>Philipp Mao</li> <!--HexHive-->
-<li>Laurane Marco</li>
-<li>Louis-Henri Merino</li>
+<li>Laurane Marco</li> <!-- LASEC -->
+<li>Louis-Henri Merino</li> <!-- DEDIS -->
 <li>Rafaila Galanopoulou</li> <!--HexHive-->
-<li><a href="https://dslab.epfl.ch/people/pirelli/">Solal Pirelli</a></li>
-<li>Solène Husseini</li> <!--HexHive-->
-<li>Mathilde Raynal</li>
-<li><a href="https://reslbesl.github.io/">Theresa Stadler</a></li>
-<li><a href="https://www.abdullahtalayhan.com">Abdullah Talayhan</a></li>
-<li>Pasindu Tennage</li>
-<li>B&eacute;n&eacute;dikt Tran</li>
-<li><a href="https://wangboya.org/">Boya Wang</a></li>
-<li>Lei Yan</li>
+<li>Sol&egrave;ne Husseini</li> <!--HexHive-->
+<li>Mathilde Raynal</li> <!-- SPRING -->
+<li><a href="https://reslbesl.github.io/">Theresa Stadler</a></li> <!-- SPRING -->
+<li><a href="https://www.abdullahtalayhan.com">Abdullah Talayhan</a></li> <!-- LASEC -->
+<li>Pasindu Tennage</li> <!-- DEDIS -->
+<li><a href="https://wangboya.org/">Boya Wang</a></li> <!-- SPRING -->
+<li>Lei Yan</li> <!-- DSL -->
 <li>Chibin Zhang</li> <!--HexHive-->
-<li>Haoqian Zhang</li>
 <li>Han Zheng</li> <!--HexHive-->
 </ul>
 </div>