Ping @mvz  -> what do you think?

Let's finish this discussion and then merge this PR.