Fixing the demo