Probably need to keep original calc.