made changes so that patching tox will not be needed.