I just updated the PR using that helper, very helpful!