diff --git a/1_install_cuda.sh b/1_install_cuda.sh
old mode 100644
new mode 100755
index 051e2bdb43c25bdd94084fae776869133db78a8e..db935fa658da8440f23f8fdb830fecd32bc8902e
--- a/1_install_cuda.sh
+++ b/1_install_cuda.sh
@@ -4,7 +4,6 @@
 ###################################
 #   Ubuntu Install script for:
 # - Nvidia graphic drivers
-# - Cuda 10.0
 # - cuDNN 7
 ###################################
 
@@ -22,65 +21,30 @@ else
     echo "Unsopported OS release"
     exit 2
 fi
-MACHINE = `uname -m`
-ARCH = 'uname -p'
+export MACHINE=`uname -m`
+export ARCH='uname -p'
 
 export DEBIAN_FRONTEND=noninteractive
 
 apt update
-apt install -y git wget linux-image-generic build-essential unzip
-
-# nvidia graphics drivers 384
-# see http://docs.nvidia.com/deeplearning/sdk/cudnn-install/                                       
-
-if [ $VER == '14.04' ]; then
-   NVIDIA_DRIVER = nvidia-diag-driver-local-repo-ubuntu1404-384.66_1.0-1_amd64.deb
-elif [ $OS == '16.04' ]; then
-   NVIDIA_DRIVER = nvidia-diag-driver-local-repo-ubuntu1604-384.66_1.0-1_amd64.deb
-else
-   echo "Unavailable nVidia drivers"
-   exit 3
-fi
-
-wget http://us.download.nvidia.com/tesla/384.66/$NVIDIA_DRIVER
-dpkg -i $NVIDIA_DRIVER
-apt update
-apt -y install nvidia-384
+apt install -y linux-headers-$(uname -r)
 
 export ROOT_URL=http://developer.download.nvidia.com/compute/cuda/repos
 
-# Cuda 10.0
-export CUDA_VERSION=9.2.148-1
-
-# see: http://docs.nvidia.com/cuda/cuda-installation-guide-linux/
-if [ $VER == '16.04' ]; then
-    UBUNTU_VERSION = ubuntu1604
-    CUDA_REPO = cuda-repo-$UBUNTU_VERSION_$CUDA_VERSION_amd64.deb
-else
-   echo "Unavailable CUDA library drivers"
-   exit 4
-fi
-
-wget $ROOT_URL/$UBUNTU_VERSION/x86_64/$CUDA_REPO
-apt-key adv --fetch-keys $ROOT_URL/$UBUNTU_VERSION/x86_64/7fa2af80.pub
-dpkg -i $CUDA_REPO
-apt update
-apt install cuda
-
 # cuDNN
 # Download requires registration:
-CUDNN = libcudnn7_7.1.4.18-1+cuda9.2_amd64.deb
-CUDNN_DEV = libcudnn7-dev_7.1.4.18-1+cuda9.2_amd64.deb
+export CUDNN=libcudnn7_7.3.1.20-1+cuda10.0_amd64.deb
+export CUDNN_DEV=libcudnn7-dev_7.3.1.20-1+cuda10.0_amd64.deb
 if [ -e $CUDNN ]; then
    dpkg -i $CUDNN
 else
-   echo Download cuDNN Runtime Library (Debian),
+   echo "Download cuDNN Runtime Library (Debian),"
    echo from https://developer.nvidia.com/rdp/cudnn-download
 fi
-if [ -e CUDNN_DEV ]; then
+if [ -e $CUDNN_DEV ]; then
    dpkg -i $CUDNN_DEV
 else
-   echo Download cuDNN Develooper Library (Debian),
+   echo "Download cuDNN Develooper Library (Debian),"
    echo from https://developer.nvidia.com/rdp/cudnn-download
 fi
 
diff --git a/2_install_libs.sh b/2_install_libs.sh
old mode 100644
new mode 100755
index 62db41a63a524f12ee1283d6adbbc8b30557967e..a8e5f6d51d8894fc8b0148d658bc4f712a1e040b
--- a/2_install_libs.sh
+++ b/2_install_libs.sh
@@ -1,12 +1,11 @@
 #!/usr/bin/env bash
 # Installation script for Deep Learning Libraries on Ubuntu, by Giuseppe Attardi (attardi@di.unipi.it)
-# Derived from:
-# https://github.com/deeplearningparis/dl-machine/blob/master/scripts/install-deeplearning-libraries.sh
 
 ######################################################################
 #   Ubuntu Install script for various ML libraries:
 # - Theano
 # - Torch7
+# - PyTorch
 # - TensorFlow
 # - ipython notebook
 # - Caffe 
@@ -63,7 +62,7 @@ sudo ldconfig
 # installed from source with system packages
 #sudo apt update
 sudo apt install -y python-pip python-dev htop
-sudo apt install -y python3-pip python3-dev htop
+sudo apt install -y python3-pip python3-dev
 sudo pip install -U pip virtualenv
 
 # avoid InsecurePlatformWarning
@@ -80,7 +79,7 @@ sudo apt install -y libfreetype6-dev libpng12-dev
 pip install matplotlib ipython[all] pandas scikit-image
 
 # Scikit-learn (generic machine learning utilities)
-pip install -e git+git://github.com/scikit-learn/scikit-learn.git#egg=scikit-learn
+pip install scikit-learn
 
 # Python extra tools:
 pip install config functools32 logging setuptools
@@ -107,10 +106,9 @@ pip install numpy six libprotobuf-dev tensorflow-tensorboard autograd
 # patch for error in File "/usr/local/lib/python3.5/dist-packages/dateutil/parser.py", line 158
 pip install --upgrade dateutils
 
-pip install tensorflow-gpu  # Python 2.7;  GPU support
-pip3 install tensorflow-gpu  # Python 3.n;  GPU support
-apt install cuda-9-0 # version 1.5 requires cuda 9.0
-pip3 install --upgrade tensorflow-gpu	# version 1.5 requires cuda 9.0
+pip install tensorflow-gpu  # Python 3.n;  GPU support
+#apt install cuda-9-0 # version 1.5 requires cuda 9.0
+#pip install --upgrade tensorflow-gpu	# version 1.5 requires cuda 9.0
 
 echo "Installed TensorFlow"
 
@@ -123,17 +121,25 @@ pip install tflearn
 if [ ! -d "torch" ]; then
     git clone https://github.com/torch/distro.git torch --recursive
     cd torch; bash install-deps; ./install.sh
-# upgrade to use libcudnn.so.7
+    # upgrade to use libcudnn.so.7
     cd torch/extra/cudnn; git checkout R7; git add .
 fi
 
 echo "Installed Torch"
 
+####################################
+# PyTorch
+####################################
+sudo -H pip install http://download.pytorch.org/whl/cu92/torch-0.4.1-cp36-cp36m-linux_x86_64.whl
+sudo -H pip install torchvision
+
+echo "Installed PyTorch"
+
 ####################################
 # Caffe
 ####################################
 
-if [ $VER == '17.04']; then
+if [ $VER == '18.04']; then
     apt install caffe-cuda
 else
    apt install -y libprotobuf-dev libleveldb-dev \
@@ -180,26 +186,23 @@ echo "nolearn wrapper installed"
 # http://keras.io/
 ####################################
 pip install keras
-pip install git+git://github.com/fchollet/keras.git --upgrade --no-deps
+#pip install git+git://github.com/fchollet/keras.git --upgrade --no-deps
 echo "Keras installed"
 
 # Glove
-pip3 install tensorboard
-pip3 install glove_python
+pip install tensorboard
+pip install glove_python
 echo "Glove installed"
 
 # Jupyter Notebooks
-python3 -m pip install --upgrade pip
-python3 -m pip install jupyter
-python -m pip install --upgrade pip
-python -m pip install jupyter
+pip install jupyter oauthenticator
 echo "Jupyter installed"
 
 # Nvidia GPU Cloud
 
 # Install Docker CE
 # see https://docs.docker.com/install/linux/docker-ee/ubuntu/
-sudo apt-get install apt-transport-https ca-certificates \
+sudo apt install apt-transport-https ca-certificates \
      curl software-properties-common
 # Add Docker’s official GPG key:
 curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
diff --git a/cuda-repo-ubuntu1604_9.2.148-1_amd64.deb b/cuda-repo-ubuntu1604_9.2.148-1_amd64.deb
deleted file mode 100644
index 47a3a5f24dc67a187fd2ed5d2d5b13ef5b0e9c58..0000000000000000000000000000000000000000
Binary files a/cuda-repo-ubuntu1604_9.2.148-1_amd64.deb and /dev/null differ
diff --git a/libcudnn7_7.1.4.18-1+cuda9.2_amd64.deb b/libcudnn7-dev_7.3.1.20-1+cuda10.0_amd64.deb
similarity index 84%
rename from libcudnn7_7.1.4.18-1+cuda9.2_amd64.deb
rename to libcudnn7-dev_7.3.1.20-1+cuda10.0_amd64.deb
index 4005ca76f99ab84abcc8d130f2e569c67b14405a..4c3e1bd64e2c8d53f8955daa68450b41204fa103 100644
Binary files a/libcudnn7_7.1.4.18-1+cuda9.2_amd64.deb and b/libcudnn7-dev_7.3.1.20-1+cuda10.0_amd64.deb differ
diff --git a/libcudnn7-dev_7.1.4.18-1+cuda9.2_amd64.deb b/libcudnn7_7.3.1.20-1+cuda10.0_amd64.deb
similarity index 76%
rename from libcudnn7-dev_7.1.4.18-1+cuda9.2_amd64.deb
rename to libcudnn7_7.3.1.20-1+cuda10.0_amd64.deb
index ce00de70b63bfc0b6d17b3ddf07d61ad4120971f..553f6698b0e981de6fb3ada5312e466fcc6b5921 100644
Binary files a/libcudnn7-dev_7.1.4.18-1+cuda9.2_amd64.deb and b/libcudnn7_7.3.1.20-1+cuda10.0_amd64.deb differ