Improvemets to copy task