Revert "change some design"

This reverts commit 6075a0e64200e4188ddc4159f915c03a1fbe6942.