Refactor, make safe for estimates.