improving EstimateKeeper