Working on additions to upstream formula.