Added copy logic