Improve calculations