updated with new weapon class with new property