Update for opt in Copy changes