Update demo to latest changes