More rework of demo.