changes to copy and tracking