Updated estimator, added reset for new runs