WIP: fixing onComplete and onCancel for copy version