changes from bot machine
merge bot server changes