Major overhaul of fake rate estimator