Updated to latest estimator version