diff --git a/install.sh b/install.sh
old mode 100644
new mode 100755
index 4d72a33..dab94f2
--- a/install.sh
+++ b/install.sh
@@ -7,46 +7,61 @@
 # $ ssh geoserver4.euclid.cristipp.dev.ai2
 
 sudo apt-get update
+sudo apt-get update
+sudo apt-get install unzip
 sudo apt-get install mysql-client mysql-server libmysqlclient-dev
 sudo apt-get install python-pip libblas-dev liblapack-dev gfortran python-numpy python-scipy python-matplotlib
-sudo pip install scikit-learn sympy networkx nltk inflect pyparsing pydot2 mysql-python django django-picklefield jsonfield django-storages boto django-modeldict pillow unipath beautifulsoup4 requests
+sudo pip install scikit-learn sympy networkx nltk inflect pyparsing pydot2 mysql-python django==1.8.2 django-picklefield jsonfield django-storages boto django-modeldict pillow unipath beautifulsoup4 requests algopy
 sudo apt-get install build-essential unzip
 sudo apt-get install cmake git libgtk2.0-dev pkg-config libavcodec-dev libavformat-dev libswscale-dev
 sudo apt-get install python-dev python-numpy libtbb2 libtbb-dev libjpeg-dev libpng-dev libtiff-dev libjasper-dev libdc1394-22-dev
 sudo pip install awscli
 echo "create database geodb" | mysql -u root
 
-sudo su ai2service <<'EOF'
-aws configure
 cd ~
-wget https://github.com/Itseez/opencv/archive/3.0.0.zip
-unzip 3.0.0.zip
+wget -nc https://github.com/Itseez/opencv/archive/3.0.0.zip
+unzip -o 3.0.0.zip
 cd opencv-3.0.0/
 mkdir release
 cd release
 cmake -D CMAKE_BUILD_TYPE=RELEASE -D CMAKE_INSTALL_PREFIX=~/usr/local -D Python_ADDITIONAL_VERSIONS=2.7 ..
-make
-make install
+sudo make
+sudo make install
 cd ~
-# git clone https://github.com/allenai/GeoServer
-# git clone https://github.com/allenai/geosolver
-# git clone https://github.com/allenai/EquationTree
+git clone https://github.com/seominjoon/geoserver.git
+git clone https://github.com/seominjoon/geosolver.git
+git clone https://github.com/seominjoon/stanford-parser-server.git
+mv geoserver GeoServer
 ghro GeoServer
 ln -s /opt/ai2ools/var/ghro/allenai/GeoServer GeoServer
 ghro geosolver
 ln -s /opt/ai2ools/var/ghro/allenai/geosolver geosolver
-ghro EquationTree
-ln -s /opt/ai2ools/var/ghro/allenai/EquationTree EquationTree
-cd GeoServer/geoserver
+wget -O stanford-parser-3.5.0.zip http://nlp.stanford.edu/software/stanford-parser-full-2014-10-31.zip
+unzip -o stanford-parser-3.5.0.zip
+mkdir -p stanford-parser-server/bin
+mkdir -p stanford-parser-server/lib
+wget https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/json-simple/json-simple-1.1.1.jar -P ./stanford-parser-server/lib/
+cp ./stanford-parser-full-2014-10-31/* ./stanford-parser-server/lib/
+cd ./stanford-parser-server
+chmod 755 run.sh
+nohup ./run.sh &
+
+# Fixes to geosolver
+
+cd ../geosolver
+sed -i 's/import pyipopt//g' geosolver/solver/numeric_solver.py
+
+cd ../GeoServer/geoserver
 # https://github.com/allenai/ai2ools/blob/master/lib/bash/helpers.sh
-aws s3 cp s3://geosolver-server/dump/89a68dc2de4e87bfc2f09ad41ef25a1b1911dd60/labels.json .
-aws s3 cp s3://geosolver-server/dump/89a68dc2de4e87bfc2f09ad41ef25a1b1911dd60/questions.json .
-aws s3 cp s3://geosolver-server/dump/89a68dc2de4e87bfc2f09ad41ef25a1b1911dd60/media.tar.gz .
+wget "https://s3-us-west-2.amazonaws.com/geosolver-server/dump/68bd697ca57cdac1f2738a8d7e468fdccd7e5545/questions.json"
+wget "https://s3-us-west-2.amazonaws.com/geosolver-server/dump/68bd697ca57cdac1f2738a8d7e468fdccd7e5545/labels.json"
+wget "https://s3-us-west-2.amazonaws.com/geosolver-server/dump/68bd697ca57cdac1f2738a8d7e468fdccd7e5545/semantics.json"
+wget "https://s3-us-west-2.amazonaws.com/geosolver-server/dump/68bd697ca57cdac1f2738a8d7e468fdccd7e5545/media.tar.gz"
 tar -xvzf media.tar.gz
 python manage.py migrate --settings=geoserver.settings.local
 python manage.py loaddata questions.json --settings=geoserver.settings.local
 python manage.py loaddata labels.json --settings=geoserver.settings.local
-# python manage.py loaddata semantics.json --settings=geoserver.settings.local
-export PYTHONPATH=~/geosolver:~/EquationTree:~/usr/local/lib/python2.7/dist-packages; nohup python manage.py runserver 0:8080 --settings=geoserver.settings.local 2>&1 > log.txt &
-EOF
-
+python manage.py loaddata semantics.json --settings=geoserver.settings.local
+export PYTHONPATH=~/geosolver:~/usr/local/lib/python2.7/dist-packages; nohup python manage.py runserver 0:8000 --settings=geoserver.settings.local 2>&1 > log.txt &
+cd ../../geosolver
+export PYTHONPATH=PYTHONPATH:~/usr/local/lib/python2.7/dist-packages; python -m geosolver.run 1025