Upgrade to new damage system