make some few changes to the estimator