Math is now correct