Added gun models and changed GW18 model