Changes to downloadEstimator on rebased branch