diff --git a/Vagrantfile b/Vagrantfile
index bf4bca6..dd8e33d 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -7,4 +7,9 @@ VAGRANTFILE_API_VERSION = "2"
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.box = "udacity/ud381"
   config.vm.network :forwarded_port, guest: 5000, host: 5000
+  if Vagrant.has_plugin?("vagrant-vbguest")
+    config.vbguest.auto_update = false
+    config.vbguest.no_install = true
+    config.vbguest.no_remote = true
+  end
 end
diff --git a/provision.sh b/provision.sh
index c8bdb24..62062c6 100755
--- a/provision.sh
+++ b/provision.sh
@@ -20,10 +20,17 @@ sudo pip install flask redis
 
 echo "Storm..."
 # TODO maybe make this use the best mirror always?
-sudo mkdir /opt/storm
-cd /opt/storm
-sudo wget http://mirror.cogentco.com/pub/apache/incubator/storm/apache-storm-0.9.2-incubating/apache-storm-0.9.2-incubating.tar.gz
-sudo tar xvzf apache-storm-0.9.2-incubating.tar.gz
-sudo rm apache-storm-0.9.2-incubating.tar.gz
-sudo chmod +x /opt/storm/apache-storm-0.9.2-incubating/bin/storm
-sudo ln -s /opt/storm/apache-storm-0.9.2-incubating/bin/storm /usr/bin/storm
+if !( [ -d /opt/storm ]); then
+  sudo mkdir /opt/storm
+  cd /opt/storm
+  sudo wget http://mirror.cogentco.com/pub/apache/storm/apache-storm-1.0.2/apache-storm-1.0.2.tar.gz
+  sudo tar xvzf apache-storm-1.0.2.tar.gz
+  sudo rm apache-storm-1.0.2.tar.gz
+  sudo chmod +x /opt/storm/apache-storm-1.0.2/bin/storm
+  if [ -a /usr/bin/storm ]; then
+    sudo rm /usr/bin/storm
+  fi
+  sudo ln -s /opt/storm/apache-storm-1.0.2/bin/storm /usr/bin/storm
+fi
+
+