diff --git a/README.md b/README.md
index 1244f74..8704a20 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
-# JuliaOnHPCClusters
+# Julia On HPC Clusters
 
-Notes on how to use/set up Julia on HPC clusters. Visit the rendered website under [juliahpc.github.io](https://juliahpc.github.io).
+Notes on how to use/set up Julia on HPC clusters.
+
+**Visit the rendered website under [juliahpc.github.io](https://juliahpc.github.io).**
diff --git a/website/_assets/element_chat.svg b/website/_assets/element_chat.svg
deleted file mode 100644
index 54a91b7..0000000
--- a/website/_assets/element_chat.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg width="200" height="200" viewBox="0 0 200 200" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M100 200C155.228 200 200 155.228 200 100C200 44.7715 155.228 0 100 0C44.7715 0 0 44.7715 0 100C0 155.228 44.7715 200 100 200Z" fill="#0DBD8B"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M81.7169 46.5946C81.7169 42.5581 84.9959 39.2859 89.0408 39.2859C116.456 39.2859 138.681 61.4642 138.681 88.8225C138.681 92.859 135.401 96.1312 131.357 96.1312C127.312 96.1312 124.033 92.859 124.033 88.8225C124.033 69.5372 108.366 53.9033 89.0408 53.9033C84.9959 53.9033 81.7169 50.6311 81.7169 46.5946Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M153.39 81.5137C157.435 81.5137 160.714 84.7859 160.714 88.8224C160.714 116.181 138.49 138.359 111.075 138.359C107.03 138.359 103.751 135.087 103.751 131.05C103.751 127.014 107.03 123.742 111.075 123.742C130.4 123.742 146.066 108.108 146.066 88.8224C146.066 84.7859 149.345 81.5137 153.39 81.5137Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M118.398 153.405C118.398 157.442 115.119 160.714 111.074 160.714C83.6592 160.714 61.4347 138.536 61.4347 111.177C61.4347 107.141 64.7138 103.869 68.7587 103.869C72.8035 103.869 76.0826 107.141 76.0826 111.177C76.0826 130.463 91.7489 146.097 111.074 146.097C115.119 146.097 118.398 149.369 118.398 153.405Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M46.6097 118.486C42.5648 118.486 39.2858 115.214 39.2858 111.178C39.2858 83.8193 61.5102 61.6409 88.9255 61.6409C92.9704 61.6409 96.2494 64.9132 96.2494 68.9497C96.2494 72.9862 92.9704 76.2584 88.9255 76.2584C69.6 76.2584 53.9337 91.8922 53.9337 111.178C53.9337 115.214 50.6546 118.486 46.6097 118.486Z" fill="white"/>
-</svg>
diff --git a/website/_assets/favicon.png b/website/_assets/favicon.png
index 6744434..6e79b48 100644
Binary files a/website/_assets/favicon.png and b/website/_assets/favicon.png differ
diff --git a/website/_assets/julia-logo.svg b/website/_assets/julia-logo.svg
deleted file mode 100644
index 0acc3dc..0000000
--- a/website/_assets/julia-logo.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="320pt" height="200pt" viewBox="0 0 320 200" version="1.1">
-<g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 67.871094 164.3125 C 67.871094 171.847656 67.023438 177.933594 65.328125 182.566406 C 63.632812 187.203125 61.222656 190.800781 58.09375 193.363281 C 54.96875 195.925781 51.21875 197.640625 46.847656 198.507812 C 42.476562 199.371094 37.613281 199.804688 32.265625 199.804688 C 25.027344 199.804688 19.488281 198.675781 15.648438 196.414062 C 11.804688 194.152344 9.882812 191.441406 9.882812 188.273438 C 9.882812 185.636719 10.953125 183.414062 13.101562 181.605469 C 15.25 179.796875 18.132812 178.894531 21.75 178.894531 C 24.464844 178.894531 26.632812 179.628906 28.25 181.097656 C 29.871094 182.566406 31.210938 184.019531 32.265625 185.449219 C 33.46875 187.03125 34.488281 188.085938 35.316406 188.613281 C 36.144531 189.140625 36.898438 189.40625 37.578125 189.40625 C 39.007812 189.40625 40.101562 188.558594 40.855469 186.863281 C 41.609375 185.167969 41.984375 181.871094 41.984375 176.972656 L 41.984375 84.050781 L 67.871094 76.929688 L 67.871094 164.3125 M 104.738281 79.414062 L 104.738281 139.214844 C 104.738281 140.875 105.058594 142.4375 105.699219 143.90625 C 106.339844 145.375 107.226562 146.640625 108.355469 147.695312 C 109.488281 148.75 110.804688 149.597656 112.3125 150.238281 C 113.820312 150.878906 115.441406 151.199219 117.175781 151.199219 C 119.132812 151.199219 121.359375 150.101562 124.070312 148.203125 C 128.363281 145.195312 130.964844 143.128906 130.964844 140.683594 C 130.964844 140.097656 130.964844 79.414062 130.964844 79.414062 L 156.738281 79.414062 L 156.738281 164.3125 L 130.964844 164.3125 L 130.964844 156.398438 C 127.574219 159.261719 123.957031 161.558594 120.113281 163.292969 C 116.269531 165.027344 112.539062 165.894531 108.921875 165.894531 C 104.703125 165.894531 100.78125 165.195312 97.164062 163.800781 C 93.546875 162.40625 90.382812 160.503906 87.671875 158.09375 C 84.957031 155.683594 82.828125 152.855469 81.28125 149.613281 C 79.738281 146.375 78.964844 142.90625 78.964844 139.214844 L 78.964844 79.414062 L 104.738281 79.414062 M 192.882812 164.3125 L 167.222656 164.3125 L 167.222656 45.277344 L 192.882812 38.15625 L 192.882812 164.3125 M 203.601562 84.050781 L 229.375 76.929688 L 229.375 164.3125 L 203.601562 164.3125 L 203.601562 84.050781 M 283.226562 120.449219 C 280.738281 121.507812 278.230469 122.730469 275.707031 124.125 C 273.183594 125.519531 270.882812 127.046875 268.8125 128.703125 C 266.738281 130.359375 265.0625 132.132812 263.78125 134.015625 C 262.5 135.898438 261.859375 137.859375 261.859375 139.894531 C 261.859375 141.476562 262.066406 143.003906 262.480469 144.472656 C 262.894531 145.941406 263.480469 147.203125 264.234375 148.257812 C 264.988281 149.3125 265.816406 150.160156 266.722656 150.800781 C 267.625 151.441406 268.605469 151.761719 269.660156 151.761719 C 271.769531 151.761719 273.898438 151.121094 276.046875 149.839844 C 278.195312 148.558594 280.585938 146.941406 283.226562 144.980469 L 283.226562 120.449219 M 309.109375 164.3125 L 283.226562 164.3125 L 283.226562 157.527344 C 281.792969 158.734375 280.398438 159.847656 279.042969 160.863281 C 277.6875 161.878906 276.160156 162.765625 274.464844 163.519531 C 272.769531 164.273438 270.867188 164.855469 268.753906 165.273438 C 266.644531 165.6875 264.15625 165.894531 261.296875 165.894531 C 257.375 165.894531 253.851562 165.328125 250.726562 164.199219 C 247.597656 163.066406 244.941406 161.523438 242.757812 159.5625 C 240.570312 157.605469 238.894531 155.285156 237.726562 152.609375 C 236.558594 149.9375 235.972656 147.015625 235.972656 143.851562 C 235.972656 140.609375 236.59375 137.671875 237.839844 135.03125 C 239.082031 132.394531 240.777344 130.023438 242.925781 127.910156 C 245.074219 125.800781 247.578125 123.917969 250.441406 122.257812 C 253.304688 120.601562 256.378906 119.074219 259.65625 117.679688 C 262.933594 116.285156 266.34375 115.007812 269.886719 113.839844 C 273.425781 112.671875 276.933594 111.558594 280.398438 110.503906 L 283.226562 109.824219 L 283.226562 101.460938 C 283.226562 96.035156 282.1875 92.191406 280.117188 89.929688 C 278.042969 87.667969 275.273438 86.539062 271.808594 86.539062 C 267.738281 86.539062 264.910156 87.519531 263.328125 89.476562 C 261.746094 91.4375 260.953125 93.808594 260.953125 96.597656 C 260.953125 98.179688 260.785156 99.726562 260.445312 101.234375 C 260.109375 102.742188 259.523438 104.058594 258.695312 105.191406 C 257.867188 106.320312 256.679688 107.226562 255.132812 107.902344 C 253.589844 108.582031 251.648438 108.921875 249.3125 108.921875 C 245.695312 108.921875 242.757812 107.882812 240.496094 105.8125 C 238.234375 103.738281 237.105469 101.121094 237.105469 97.953125 C 237.105469 95.015625 238.101562 92.285156 240.097656 89.761719 C 242.097656 87.234375 244.789062 85.066406 248.183594 83.261719 C 251.574219 81.449219 255.492188 80.019531 259.9375 78.964844 C 264.382812 77.910156 269.09375 77.382812 274.066406 77.382812 C 280.171875 77.382812 285.429688 77.929688 289.839844 79.019531 C 294.246094 80.113281 297.882812 81.675781 300.746094 83.710938 C 303.609375 85.746094 305.71875 88.195312 307.074219 91.058594 C 308.433594 93.921875 309.109375 97.128906 309.109375 100.667969 L 309.109375 164.3125 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(79.6%,23.5%,20%);fill-opacity:1;" d="M 235.273438 55.089844 C 235.273438 64.757812 227.4375 72.589844 217.773438 72.589844 C 208.105469 72.589844 200.273438 64.757812 200.273438 55.089844 C 200.273438 45.425781 208.105469 37.589844 217.773438 37.589844 C 227.4375 37.589844 235.273438 45.425781 235.273438 55.089844 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(25.1%,38.8%,84.7%);fill-opacity:1;" d="M 72.953125 55.089844 C 72.953125 64.757812 65.117188 72.589844 55.453125 72.589844 C 45.789062 72.589844 37.953125 64.757812 37.953125 55.089844 C 37.953125 45.425781 45.789062 37.589844 55.453125 37.589844 C 65.117188 37.589844 72.953125 45.425781 72.953125 55.089844 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(58.4%,34.5%,69.8%);fill-opacity:1;" d="M 277.320312 55.089844 C 277.320312 64.757812 269.484375 72.589844 259.820312 72.589844 C 250.15625 72.589844 242.320312 64.757812 242.320312 55.089844 C 242.320312 45.425781 250.15625 37.589844 259.820312 37.589844 C 269.484375 37.589844 277.320312 45.425781 277.320312 55.089844 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22%,59.6%,14.9%);fill-opacity:1;" d="M 256.300781 18.671875 C 256.300781 28.335938 248.464844 36.171875 238.800781 36.171875 C 229.132812 36.171875 221.300781 28.335938 221.300781 18.671875 C 221.300781 9.007812 229.132812 1.171875 238.800781 1.171875 C 248.464844 1.171875 256.300781 9.007812 256.300781 18.671875 "/>
-</g>
-</svg>
diff --git a/website/_assets/juliahpc_logo.png b/website/_assets/juliahpc_logo.png
new file mode 100644
index 0000000..dcfbc97
Binary files /dev/null and b/website/_assets/juliahpc_logo.png differ
diff --git a/website/_css/custom.css b/website/_css/custom.css
index 29182d9..4ad36f4 100644
--- a/website/_css/custom.css
+++ b/website/_css/custom.css
@@ -1,5 +1,11 @@
 @import url("https://fonts.googleapis.com/css2?family=PT+Sans+Caption:wght@700&family=PT+Sans:ital,wght@0,400;0,700;1,400;1,700&display=swap");
 
+.im-10 {text-align: center;}
+.im-10 img {
+    padding: 0;
+    width: 10%;
+}
+
 h1 {
     border-bottom: 1px solid #999 !important;
     margin-bottom: 1em !important;
diff --git a/website/_css/poole_hyde.css b/website/_css/poole_hyde.css
index b0d39de..8a1df55 100644
--- a/website/_css/poole_hyde.css
+++ b/website/_css/poole_hyde.css
@@ -267,7 +267,7 @@ html {
     top: 0;
     left: 0;
     bottom: 0;
-    width: 23rem;
+    width: 19rem;
     text-align: left;
   }
 }
diff --git a/website/_layout/page_foot.html b/website/_layout/page_foot.html
index 7e186f7..e128b83 100644
--- a/website/_layout/page_foot.html
+++ b/website/_layout/page_foot.html
@@ -1,6 +1,6 @@
 <div class="page-foot">
   <div class="copyright">
-    <a href="https://github.com/carstenbauer/JuliaOnHPCClusters/"><b>Edit this page on <img class="github-logo" src="https://unpkg.com/ionicons@5.1.2/dist/svg/logo-github.svg"></img></b></a><br>
+    <a href="https://github.com/JuliaHPC/juliahpc.github.io/"><b>Edit this page on <img class="github-logo" src="https://unpkg.com/ionicons@5.1.2/dist/svg/logo-github.svg"></img></b></a><br>
     {{isnotpage /tag/*}}Last modified: {{ fill fd_mtime }}.{{end}} Website built with <a href="https://github.com/tlienart/Franklin.jl">Franklin.jl</a> and the <a href="https://julialang.org">Julia programming language</a>.
   </div>
 </div>
diff --git a/website/_layout/sidebar.html b/website/_layout/sidebar.html
index a8f47fd..20a048c 100644
--- a/website/_layout/sidebar.html
+++ b/website/_layout/sidebar.html
@@ -16,9 +16,9 @@ <h1><a href="/">Julia On HPC Clusters</a></h1>
       <div class="course-section">For Users</div>
       <a class="sidebar-nav-item {{ispage user_gettingstarted/*}}active{{end}}" href="/user_gettingstarted/">Getting started</a>
       <a class="sidebar-nav-item {{ispage user_vscode/*}}active{{end}}" href="/user_vscode/">Visual Studio Code on HPC Clusters</a>
-      <a class="sidebar-nav-item {{ispage user_faq/*}}active{{end}}" href="/user_faq/">FAQ</a>
       <a class="sidebar-nav-item {{ispage user_hpcprofiling/*}}active{{end}}" href="/user_hpcprofiling/">HPC profiling tools</a>
       <a class="sidebar-nav-item {{ispage user_hpcsystems/*}}active{{end}}" href="/user_hpcsystems/">HPC systems with Julia support</a>
+      <a class="sidebar-nav-item {{ispage user_faq/*}}active{{end}}" href="/user_faq/">FAQ</a>
       <!-- <a class="sidebar-nav-item {{ispage user_jlls/*}}active{{end}}" href="/user_jlls/">JLLs and system software</a> -->
       <div class="course-section">For System Admins</div>
       <a class="sidebar-nav-item {{ispage sysadmin_julia/*}}active{{end}}" href="/sysadmin_julia/">How to provide Julia to users?</a>
diff --git a/website/_layout/style.html b/website/_layout/style.html
index 834c608..b45efdd 100644
--- a/website/_layout/style.html
+++ b/website/_layout/style.html
@@ -4,7 +4,7 @@
 <!-- style adjustments -->
 <style>
   html {font-size: 17px;}
-  .franklin-content {position: relative; padding-left: 8%; padding-right: 5%; line-height: 1.35em;}
+  .franklin-content {position: relative; padding-left: 1%; padding-right: 5%; line-height: 1.35em;}
   @media (min-width: 940px) {
     .franklin-content {width: 100%; margin-left: auto; margin-right: auto;}
   }
diff --git a/website/_literate/user_general.jl b/website/_literate/user_general.jl
deleted file mode 100644
index 7152e28..0000000
--- a/website/_literate/user_general.jl
+++ /dev/null
@@ -1,201 +0,0 @@
-#src # This is needed to make this run as normal Julia file
-using Markdown #src
-
-#nb # %% A slide [markdown] {"slideshow": {"slide_type": "slide"}}
-#nb # _Lecture 1_
-md"""
-# Why solve PDEs on GPUs? & The tool for the job
-"""
-
-#src #########################################################################
-#nb # %% A slide [markdown] {"slideshow": {"slide_type": "slide"}}
-md"""
-## Why solve PDEs on GPUs?
-"""
-
-#md # ~~~
-# <center>
-#   <video width="80%" autoplay loop controls src="../assets/literate_figures/l1_porous_convection_2D.mp4"/>
-# </center>
-#md # ~~~
-
-#src #########################################################################
-#nb # %% A slide [markdown] {"slideshow": {"slide_type": "slide"}}
-md"""
-### A brief intro about GPU computing:
-- Why we do it
-- Why it is cool (in Julia)
-- Examples from current research
-"""
-
-#src #########################################################################
-#nb # %% A slide [markdown] {"slideshow": {"slide_type": "slide"}}
-md"""
-### Propaganda
-#### Why we do it
-"""
-
-#nb # %% A slide [markdown] {"slideshow": {"slide_type": "fragment"}}
-md"""
-Predict the evolution of natural and engineered systems.
-
-![ice2](../assets/literate_figures/l1_ice2.png)
-
-_e.g. ice cap evolution, stress distribution, etc..._
-"""
-
-#src #########################################################################
-#nb # %% A slide [markdown] {"slideshow": {"slide_type": "slide"}}
-md"""
-Physical processes that describe those systems are **complex** and often **nonlinear**
-- no or very limited analytical solution is available
-
-👉 a numerical approach is required to solve the mathematical model
-"""
-
-#src #########################################################################
-#nb # %% A slide [markdown] {"slideshow": {"slide_type": "slide"}}
-md"""
-A numerical solution means solving a system of (coupled) differential equations
-
-$$
-\mathbf{mathematical ~ model ~ → ~ discretisation ~ → ~ solution}\\
-\frac{∂C}{∂t} = ... ~ → ~ \frac{\texttt{C}^{i+1} - \texttt{C}^{i}}{\texttt{∆t}} = ... ~ → ~ \texttt{C} = \texttt{C} + \texttt{∆t} \cdot ...
-$$
-
-"""
-
-#src #########################################################################
-#nb # %% A slide [markdown] {"slideshow": {"slide_type": "slide"}}
-md"""
-Solving PDEs is computationally demanding
-- ODEs - scalar equations
-
-$$ \frac{∂C}{∂t} = -\frac{(C-C_{eq})}{ξ} $$
-
-but...
-"""
-
-#nb # %% A slide [markdown] {"slideshow": {"slide_type": "fragment"}}
-md"""
-- PDEs - involve vectors (and tensors)  👉 local gradients & neighbours
-
-$$ \frac{∂C}{∂t} = D~ \left(\frac{∂^2C}{∂x^2} + \frac{∂^2C}{∂y^2} \right) $$
-
-"""
-
-#src #########################################################################
-#nb # %% A slide [markdown] {"slideshow": {"slide_type": "slide"}}
-md"""
-Computational costs increase
-- with complexity (e.g. multi-physics, couplings)
-- with dimensions (3D tensors...)
-- upon refining spatial and temporal resolution
-
-"""
-
-#src #########################################################################
-#nb # %% A slide [markdown] {"slideshow": {"slide_type": "slide"}}
-#md # ~~~
-# <center>
-#   <video width="80%" autoplay loop controls src="../assets/literate_figures/l1_Stokes2D_vep.mp4"/>
-# </center>
-#md # ~~~
-
-#src #########################################################################
-#nb # %% A slide [markdown] {"slideshow": {"slide_type": "slide"}}
-md"""
-Use **parallel computing** to address this:
-- The "memory wall" in ~ 2004
-- Single-core to multi-core devices
-
-![mem_wall](../assets/literate_figures/l1_mem_wall.png)
-
-"""
-
-#src #########################################################################
-#nb # %% A slide [markdown] {"slideshow": {"slide_type": "slide"}}
-md"""
-GPUs are _massively_ parallel devices
-- SIMD machine (programmed using threads - SPMD) ([more](https://safari.ethz.ch/architecture/fall2020/lib/exe/fetch.php?media=onur-comparch-fall2020-lecture24-simdandgpu-afterlecture.pdf))
-- Further increases the Flop vs Bytes gap
-
-![cpu_gpu_evo](../assets/literate_figures/l1_cpu_gpu_evo.png)
-
-"""
-
-#nb # %% A slide [markdown] {"slideshow": {"slide_type": "fragment"}}
-md"""
-👉 We are memory bound: requires to re-think the numerical implementation and solution strategies
-"""
-
-#src #########################################################################
-#nb # %% A slide [markdown] {"slideshow": {"slide_type": "slide"}}
-md"""
-#### Why it is cool
-"""
-
-#src #########################################################################
-#nb # %% A slide [markdown] {"slideshow": {"slide_type": "fragment"}}
-md"""
-![julia-gpu](../assets/literate_figures/l1_julia-gpu.png)
-
-"""
-
-#src #########################################################################
-#nb # %% A slide [markdown] {"slideshow": {"slide_type": "slide"}}
-md"""
-#### GPU are cool
-- Price vs Performance; Close to **1.5TB/s** memory throughput (nonlinear diffusion) that one can achieve :rocket:
-
-![perf_gpu](../assets/literate_figures/l1_perf_gpu.png)
-"""
-
-#src #########################################################################
-#nb # %% A slide [markdown] {"slideshow": {"slide_type": "slide"}}
-md"""
-- Availability (less fight for resources); Still not many applications run on GPUs
-
-- Workstation turns into a personal Supercomputers; GPU vs CPUs peak memory bandwidth: theoretical 10x (practically more)
-
-![titan_node](../assets/literate_figures/l1_titan_node.jpg)
-
-"""
-
-#src #########################################################################
-#nb # %% A slide [markdown] {"slideshow": {"slide_type": "slide"}}
-md"""
-#### Julia is cool
-Solution to the "two-language problem"
-- Single code for prototyping and production
-
-![two_lang](../assets/literate_figures/l1_two_lang.png)
-"""
-
-#src #########################################################################
-#nb # %% A slide [markdown] {"slideshow": {"slide_type": "slide"}}
-md"""
-Backend agnostic:
-- Single code to run on single CPU or thousands of GPUs
-- Single code to run on various CPUs (x86, Power9, ARM) \
-  and GPUs (Nvidia, AMD)
-
-Interactive:
-- No need for 3rd-party visualisation software
-- Debugging and interactive REPL mode
-- Efficient for development
-"""
-
-#src #########################################################################
-#nb # %% A slide [markdown] {"slideshow": {"slide_type": "slide"}}
-md"""
-#### Examples from current research
-
-- [ParallelStencil _miniapps_](https://github.com/omlins/ParallelStencil.jl#miniapp-content)
-- [Ice-flow modelling](https://github.com/luraess/julia-parallel-course-EGU21#greenlands-ice-cap-evolution)
-- [GPU4GEO - _Frontier GPU multi-physics solvers_](https://ptsolvers.github.io/GPU4GEO/software/)
-- [3D hydro-mechanical inversions](https://github.com/PTsolvers/PseudoTransientAdjoint.jl#3d-hydro-mechanically-constrained-inversion)
-- [3D Random fields](https://github.com/luraess/ParallelRandomFields.jl#parallelrandomfieldsjl)
-- more ...
-
-"""
diff --git a/website/index.md b/website/index.md
index 66ba416..09a3f78 100644
--- a/website/index.md
+++ b/website/index.md
@@ -4,6 +4,10 @@ title = "Julia On HPC Clusters"
 
 # Julia on HPC clusters
 
+@@im-10
+![JuliaHPC](/assets/juliahpc_logo.png)
+@@
+
 👋 Welcome to the notes about the [Julia programming language](http://www.julialang.org/) on HPC clusters.
 
 ## Objective
@@ -35,10 +39,10 @@ PRs or via public or private communication:
 * Mirek Kratochvíl ([@exaexa](https://github.com/exaexa))
 * Pedro Ojeda ([@pojeda](https://github.com/pojeda))
 * Samuel Omlin ([@omlins](https://github.com/omlins)) - CSCS / ETHZ
-* Ludovic Räss ([@luraess](https://github.com/luraess)) - ETHZ
+* Ludovic Räss ([@luraess](https://github.com/luraess)) - Unil / ETHZ
 * Michael Schlottke-Lakemper ([@sloede](https://github.com/sloede)) - HLRS / RWTH
 * Erik Schnetter ([@eschnett](https://github.com/eschnett)) - PITP
 * Dinindu Senanayake ([@DininduSenanayake](https://github.com/DininduSenanayake))
 * Kjartan Thor Wikfeldt ([@wikfeldt](https://github.com/wikfeldt)) - ENCCS
 
-(You think we forgot your name here? Please make a PR!)
\ No newline at end of file
+(You think we forgot your name here? Please make a PR!)