Small changes

Changing method for getting weapon