Added weapon switching