final changes before rollout v3