diff --git a/upgrade b/upgrade
index 2b4b6c3f..7c9a6cec 100644
--- a/upgrade
+++ b/upgrade
@@ -3,6 +3,9 @@
 # EasyEngine update script.
 # This script is designed to update current EasyEngine from 2.2.2 to 3.x
 # Define echo function
+old_ee_version="2.2.3"
+branch=$1
+
 # Blue color
 
 function ee_lib_echo()
@@ -28,23 +31,84 @@ if [[ $EUID -ne 0 ]]; then
 fi
 
 # Check old EasyEngine is installed or not
-which ee > /dev/null
-if [[ $? -ne 0 ]]; then
+if [ ! -f /usr/local/sbin/easyengine ]; then
     ee_lib_echo_fail "EasyEngine 2.0 not found"
     exit 1
 fi
 
 # Check old EasyEngine version
-ee version | grep "2.2.2" > /dev/null
+ee version | grep ${old_ee_version} &>> /dev/null
 if [[ $? -ne 0 ]]; then
-    ee_lib_echo_fail "EasyEngine 2.2.2 not found on your system"
+    ee_lib_echo_fail "EasyEngine $old_ee_version not found on your system"
     ee_lib_echo_fail "Please update is using command: ee update"
     exit 1
 fi
 
+# Capture errors
+function ee_lib_error()
+{
+    echo "[ `date` ] $(tput setaf 1)$@$(tput sgr0)"
+    exit $2
+}
+
 # Execute: apt-get update
 ee_lib_echo "Executing apt-get update"
 apt-get update &>> /dev/null
 
 # Install Python3 on users system
-ee_lib_echo "Installing Python3 on system"
+ee_lib_echo "Installing Python3"
+apt-get -y install python3 python3-apt python3-setuptools python3-dev
+if [[ $? -ne 0 ]]; then
+    ee_lib_echo_fail "Unable to install Python3 on system"
+    exit 1
+fi
+
+# Remove old version of EasyEngine (ee)
+rm -rf /tmp/easyengine &>> /dev/null
+
+# Clone EE 3.0 Python branch
+ee_lib_echo "Cloning EasyEngine 3.0"
+if [ "$branch" = "" ]; then
+    branch=python
+fi
+
+git clone -b $branch https://github.com/rtCamp/easyengine.git /tmp/easyengine > /dev/null || ee_lib_error "Unable to clone EasyEngine, exit status" 1
+
+cd /tmp/easyengine
+ee_lib_echo "Installing EasyEngine 3.0"
+python3 setup.py install || ee_lib_error "Unable to install EasyEngine 3.0, exit status " 1
+
+# Preserve old configuration
+ee_lib_echo "Updating EasyEngine 3.0 configuration"
+
+grant_host=$(grep grant-host /etc/easyengine/ee.conf | awk '{ print $3 }')
+db_name=$(grep db-name /etc/easyengine/ee.conf | awk '{ print $3 }')
+db_user=$(grep db-name /etc/easyengine/ee.conf | awk '{ print $3 }')
+wp_prefix=$(grep prefix /etc/easyengine/ee.conf | awk '{ print $3 }')
+wp_user=$(grep 'user ' /etc/easyengine/ee.conf | grep -v db-user |awk '{ print $3 }')
+wp_pass=$(grep password /etc/easyengine/ee.conf | awk '{ print $3 }')
+wp_email=$(grep email /etc/easyengine/ee.conf | awk '{ print $3 }')
+ip_addr=$(grep ip-address /etc/easyengine/ee.conf |awk -F'=' '{ print $2 }')
+
+sed -i "s/ip-address.*/ip-address = ${ip_addr}/" /etc/ee/ee.conf && \
+sed -i "s/grant-host.*/grant-host = ${grant_host}/" /etc/ee/ee.conf && \
+sed -i "s/db-name.*/db-name = ${db-name}/" /etc/ee/ee.conf && \
+sed -i "s/db-user.*/db-user = ${db_user}/" /etc/ee/ee.conf && \
+sed -i "s/prefix.*/prefix = ${wp_prefix}/" /etc/ee/ee.conf && \
+sed -i "s/^user.*/user = ${wp_user}/" /etc/ee/ee.conf && \
+sed -i "s/password.*/password = ${wp_password}/" /etc/ee/ee.conf && \
+sed -i "s/email.*/email = ${wp_email}/" /etc/ee/ee.conf || ee_lib_error "Unable to update configuration, exit status " 1
+
+
+# Remove old EasyEngine
+ee_lib_echo "Removing EasyEngine 2"
+rm -rf /etc/bash_completion.d/ee /etc/easyengine/ /usr/share/easyengine/ /usr/local/lib/easyengine /usr/local/sbin/easyengine /usr/local/sbin/ee /var/log/easyengine
+
+ee_lib_echo "Doing GIT init"
+cd /etc/ee
+if [ ! -d /etc/ee/.git ]; then
+    git init > /dev/null
+fi
+git commit -am "Update EasyEngine 2 to EasyEngine 3" > /dev/null
+
+ee_lib_echo "Successfully update to EasyEngine 3"