Update to demo code