This supersedes #132 making it more configurable, if ever needed.
This supersedes #132 making it more configurable, if ever needed.