Added gun changing