changed weapon format