first round revamping for v2