Copy changes

as per ticket:
https://www.pivotaltracker.com/story/show/74844320