mostly changes to the demo.