final changes for v2