Ok. I can update the PR with this if it is ok with you guys.