Tighten copy some more