Improve the demo script