diff --git a/vm-setup.sh b/vm-setup.sh
index ea6e825..bfb49bc 100644
--- a/vm-setup.sh
+++ b/vm-setup.sh
@@ -6,26 +6,29 @@
 ONOS_USER=mininet
 ONOS_USER_HOME=/home/${ONOS_USER}
 
-ECLIPSE_URL=http://ftp.osuosl.org/pub/eclipse/technology/epp/downloads/release/luna/R/eclipse-java-luna-R-linux-gtk-x86_64.tar.gz
-
 sudo apt-get update
 
-# ------------- Install ONOS Dependencies -------------
-sudo apt-get install -y openjdk-7-jdk
-sudo apt-get install -y maven
+# -------------- Bufferbloat Install ----------
 
-# Not needed: Adding JAVA_HOME and adding java/bin to PATH
-#cat << EOF >> $ONOS_USER_HOME/.profile
-#JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64
-#PATH=\$PATH:\$JAVA_HOME/bin
-#EOF
+cd ~
+git clone https://bitbucket.org/huangty/cs144_bufferbloat.git
+sudo apt-get -y install screen
+sudo apt-get -y install python-matplotlib
 
-# Install Zookeeper
-wget http://apache.osuosl.org/zookeeper/zookeeper-3.4.6/zookeeper-3.4.6.tar.gz
-tar xvzf zookeeper-3.4.6.tar.gz
+# -------------- BGP-attack Install -----------
 
-# CLI dependencies
-sudo apt-get install -y python-flask python-cmd2 python-pyparsing
+git clone https://bitbucket.org/jvimal/bgp.git
+cd bgp
+./install.sh
+cd ~
+
+# ------------- DHCP demo Install ------------
+
+git clone https://bitbucket.org/lantz/cs144-dhcp.git
+cd cs144-dhcp
+# TODO fix this
+#sudo ./dhcp.py --check-required
+cd ~
 
 # -------------- Setup Desktop ----------------
 sudo apt-get install -y xorg lxde
@@ -41,16 +44,16 @@
 
 mkdir -p ${DESKTOP}
 
-cat > ${DESKTOP}/Eclipse << EOF
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=Eclipse
-Name[en_US]=Eclipse
-Icon=/opt/eclipse/icon.xpm
-Exec=/usr/bin/eclipse
-Comment[en_US]=
-EOF
+#cat > ${DESKTOP}/Eclipse << EOF
+#[Desktop Entry]
+#Encoding=UTF-8
+#Type=Application
+#Name=Eclipse
+#Name[en_US]=Eclipse
+#Icon=/opt/eclipse/icon.xpm
+#Exec=/usr/bin/eclipse
+#Comment[en_US]=
+#EOF
 
 cat > ${DESKTOP}/Terminal << EOF
 [Desktop Entry]
@@ -63,17 +66,7 @@
 Comment[en_US]=
 EOF
 
-cat > ${DESKTOP}/Gerrit << EOF
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=ONOS Gerrit
-Name[en_US]=ONOS Gerrit
-Icon=internet-web-browser
-Exec=/usr/bin/chromium-browser http://gerrit.onlab.us
-Comment[en_US]=
-EOF
-
+#TODO
 cat > ${DESKTOP}/Docs << EOF
 [Desktop Entry]
 Encoding=UTF-8
@@ -104,15 +97,3 @@
 sudo dpkg-reconfigure -f noninteractive wireshark-common
 sudo usermod -a -G wireshark mininet
 
-sudo apt-get install -y git-review
-
-wget -c -N -O /tmp/eclipse.tar.gz ${ECLIPSE_URL}
-tar xzf /tmp/eclipse.tar.gz
-sudo mv eclipse /opt
-sudo ln -s /opt/eclipse/eclipse /usr/bin/eclipse
-
-# ------------ Change username and hostname ---------------
-echo 'mininet:onos' | sudo chpasswd
-sudo mv /home/mininet /home/onos
-sudo sed -i 's/mininet/onos/g' /etc/group /etc/gshadow /etc/hosts /etc/hostname /etc/passwd /etc/shadow /etc/sudoers
-