Weapon analysis updated