rework demo options some more
try again, this time without the globals