New package, modified classes, Improved damage calculation.