Transfer related changes #2