refactorings for v2*