Make live demo-ing work!