added TODO and changed rfc estimator