Move new demo to sandbox, and make some modifications.