Addresses @yhuai's comments