Completed implementation of replaces retarget