Update to allow transfer between machines