Revert "Revert "v3 update""

This reverts commit e238736025ee24072542580a882c11fa01c15e9d.