Improved damage calculation