Added need_to_transfer?