Starting to modify damage calculations