Weapon switch changes