Updated Weapon System