Improved math