updated scrubber calculation, but logic and flow needs improvement