Revert "Update the code of the demo"

This reverts commit bd08abef8a7db7a03d86a82d41270049e9b1eee3.
Revert "Revert "Update the code of the demo""

This reverts commit 0016b4282a35ecb79cf38c65f0dc26bc25cb6f1b.