Added new estimator and new functionality.