Demo script improvements