Made same changes to xfer.