Makes sense, will incorporate this in a new commit to the PR