So I was working on the master branch instead of a local branch. After merging mine and Oliviers work was undone, I redid the changes in this commit. We should do a quick test next friday to check if everything still works as expected