Maybe make it another PR  ?