Make some change in logic and storage
Revert "Make some change in logic and storage"

This reverts commit 67b4c052944cff3273c610f1eea87ca452afa2f5.