Upgraded the demo