Changes to demo put here