More work on the demo