Demo modified