Changes to demo