Changes to demo-script