Weapon changes
sorry for overcommits