Idea was to not have this in the same PR, but another one :)