Improved calculation.