Revert "Revert "change design""

This reverts commit 2a2a0f69518333f1bd83d6fdd17071c8c7c55d7f.