Added machine detection to the transfer method