Added weapon swapping