Added back in weapon.ts