Revert "Modified for Demo can be reverted"

This reverts commit 2e323669e890870f10f3e09f3c79c9b49ae3291a.