Merged issue with damage calculations.