Make demo more usable