Tweak of our bootleg sandbox