Update to match Combat Tag