Ah ok cool, I prefer to merge this one now and have a different PR.