Revert "developing and fix bugs"

This reverts commit 206ea0aae4d1535cde8831e9a93fc3a483869566.