Modify for copy/restore