Revert "better design"

This reverts commit 0241944f4c96f007caa65f8e31aab949f92d1358.