More work on the demos.