Re-worked damage and defense