Upgraded demo