diff --git a/install_minimal/include/airtime-upgrade.php b/install_minimal/include/airtime-upgrade.php
index 442869e4c..a8fe48027 100644
--- a/install_minimal/include/airtime-upgrade.php
+++ b/install_minimal/include/airtime-upgrade.php
@@ -104,12 +104,4 @@ if (strcmp($version, "2.1.0") < 0){
     passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini $SCRIPTPATH/../upgrades/airtime-2.1.0/airtime-upgrade.php");
 } 
 
-//set the new version in the database.
-$sql = "DELETE FROM cc_pref WHERE keystr = 'system_version'";
-$con->exec($sql);
-
-$newVersion = AIRTIME_VERSION;
-$sql = "INSERT INTO cc_pref (keystr, valstr) VALUES ('system_version', '$newVersion')";
-$con->exec($sql);
-
 echo "******************************* Upgrade Complete *******************************".PHP_EOL;
diff --git a/install_minimal/upgrades/airtime-2.1.0/DbUpgrade.php b/install_minimal/upgrades/airtime-2.1.0/DbUpgrade.php
index 62ff50243..80f483f40 100644
--- a/install_minimal/upgrades/airtime-2.1.0/DbUpgrade.php
+++ b/install_minimal/upgrades/airtime-2.1.0/DbUpgrade.php
@@ -8,7 +8,6 @@ class AirtimeDatabaseUpgrade{
     public static function start($p_dbValues){
         echo "* Updating Database".PHP_EOL;
         self::task0($p_dbValues);
-        self::task1();
         echo " * Complete".PHP_EOL;
     }
 
@@ -22,36 +21,5 @@ class AirtimeDatabaseUpgrade{
         $dir = __DIR__;
         
         passthru("export PGPASSWORD=$password && psql -h $host -U $username -q -f $dir/data/upgrade.sql $database 2>&1 | grep -v \"will create implicit index\"");
-        
-        $sql = "SELECT id from cc_subjs WHERE type = 'A' LIMIT 1;";
-        $result = UpgradeCommon::queryDb($sql);
-        $admin_id = $result->fetchColumn(0);
-        
-        $sql = "UPDATE cc_playlist SET creator_id = $admin_id";
-        echo $sql.PHP_EOL;
-        UpgradeCommon::queryDb($sql);
-       
-        $sql = "INSERT INTO cc_pref(keystr, valstr) VALUES('scheduled_play_switch', 'on')";
-        UpgradeCommon::queryDb($sql);
-        
-        $log_sql = "INSERT INTO cc_live_log(state, start_time) VALUES('S', now() at time zone 'UTC')";
-        UpgradeCommon::queryDb($log_sql);
     }
-    
-    /*
-     * set values for playout_status in cc_schedule
-     */
-    private static function task1() {
-        $con = Propel::getConnection(CcSchedulePeer::DATABASE_NAME);
-        
-        $showInstances = CcShowInstancesQuery::create()
-            ->setFormatter(ModelCriteria::FORMAT_ON_DEMAND)
-            ->filterByDbStarts(gmdate("Y-m-d H:i:s"), Criteria::GREATER_EQUAL)
-            ->find($con);
-        
-        foreach ($showInstances as $instance) {
-            $instance->updateScheduleStatus($con);
-        }
-    }
-
 }
diff --git a/install_minimal/upgrades/airtime-2.1.0/data/upgrade.sql b/install_minimal/upgrades/airtime-2.1.0/data/upgrade.sql
index 31dd44d4f..5d81e8818 100644
--- a/install_minimal/upgrades/airtime-2.1.0/data/upgrade.sql
+++ b/install_minimal/upgrades/airtime-2.1.0/data/upgrade.sql
@@ -143,3 +143,23 @@ ALTER TABLE cc_subjs_token
 CREATE INDEX cc_files_file_exists_idx ON cc_files USING btree (file_exists);
 
 DROP FUNCTION airtime_to_int(chartoconvert character varying);
+
+
+UPDATE cc_playlist SET creator_id = (SELECT id FROM cc_subjs WHERE type = 'A' LIMIT 1);
+
+DELETE FROM cc_pref WHERE keystr = 'scheduled_play_switch';
+INSERT INTO cc_pref(keystr, valstr) VALUES('scheduled_play_switch', 'on');
+
+INSERT INTO cc_live_log(state, start_time) VALUES('S', now() at time zone 'UTC');
+
+DELETE FROM cc_pref WHERE keystr = 'system_version';
+INSERT INTO cc_pref (keystr, valstr) VALUES ('system_version', '2.1.0');
+ 
+--UPDATE
+UPDATE cc_schedule SET playout_status = 1 WHERE id in (SELECT DISTINCT s.id FROM cc_schedule as s LEFT JOIN cc_show_instances as si ON si.id = s.instance_id WHERE s.ends <= si.ends AND s.playout_status >= 0); 
+
+UPDATE cc_schedule SET playout_status = 2 WHERE id in (SELECT DISTINCT s.id FROM cc_schedule as s LEFT JOIN cc_show_instances as si ON si.id = s.instance_id WHERE s.starts < si.ends AND s.ends > si.ends AND s.playout_status >= 0);
+
+UPDATE cc_schedule SET playout_status = 0 WHERE id in (SELECT DISTINCT s.id FROM cc_schedule as s LEFT JOIN cc_show_instances as si ON si.id = s.instance_id WHERE s.starts > si.ends AND s.playout_status >= 0);
+
+