Revert "finish 8 ver2"

This reverts commit 9dc5feec57872e3533b59b259c0ea12cb52d4948.
Revert "Revert "finish 8 ver2""

This reverts commit 782e2e60d8aac4bb9b4badec0cc5fd751972b70a.