yes yes, but this PR is for a fix. not a refactor. ( the refactor is up next )...