round 2 - Copy fixes