Moreover I can see it in more places in the pr, can be it shared? or if it add complexity, forget my comment