#59 - improve copy tracking