Revert "Revert "Update -v2""

This reverts commit 80e7f5cb584eadc052caacb7245e01e45baf097d.