updated with new weapon class