A bit more work on demo.