Enhance the calculation