Improved calculation speed