A few more changes, to make the demo more compelling.