Revert "Revert "Version2""

This reverts commit 605267403ce807cf49aaee0ce30079916e2a07c3.