Fixing up demo