Cool. I was going to ask you to if it is ok to do it in another PR :)