Updated fake estimator and table maker