Tested and untested changes for randombot