Working update to fake estimator