Changed the structure of the original 1D estimator for easy deployments.