I have to change here something in the code. I want to do this in a new pull request (when this one is merged)