diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php
index 590edb35e..2d42aff47 100644
--- a/airtime_mvc/application/controllers/ApiController.php
+++ b/airtime_mvc/application/controllers/ApiController.php
@@ -202,32 +202,6 @@ class ApiController extends Zend_Controller_Action
             exit;
         }
     }
-
-    public function todayInfoAction()
-    {
-        if (Application_Model_Preference::GetAllow3rdPartyApi()){
-            // disable the view and the layout
-            $this->view->layout()->disableLayout();
-            $this->_helper->viewRenderer->setNoRender(true);
-
-            $date = new Application_Model_DateHelper;
-            $utcTimeNow = $date->getUtcTimestamp();
-            $utctimeEnd = Application_Model_DateHelper::GetDayEndTimestampInUtc();
-            
-            $result = array("env"=>APPLICATION_ENV,
-                "schedulerTime"=>gmdate("Y-m-d H:i:s"),
-                "nextShow"=>Application_Model_Show::GetNextShows($utcTimeNow, 5, $utcTimeEnd));
-                
-            Application_Model_Show::ConvertToLocalTimeZone($result["nextShow"], array("starts", "ends", "start_timestamp", "end_timestamp"));
-
-            header("Content-type: text/javascript");
-            echo $_GET['callback'].'('.json_encode($result).')';
-        } else {
-            header('HTTP/1.0 401 Unauthorized');
-            print 'You are not allowed to access this resource. ';
-            exit;
-        }
-    }
     
     public function weekInfoAction()
     {
diff --git a/widgets/js/jquery.showinfo.js b/widgets/js/jquery.showinfo.js
index b57f8d7c4..1c75b7918 100644
--- a/widgets/js/jquery.showinfo.js
+++ b/widgets/js/jquery.showinfo.js
@@ -16,7 +16,9 @@
         getServerData();
 
         function updateWidget(){
-            var shows = sd.getNextShows();
+            var currentShow = sd.getCurrentShow();
+            var nextShows = sd.getNextShows();
+            var shows = currentShow.length == 0 ? nextShows : currentShow.concat(nextShows);
 
             tableString = "";
             tableString += "<h3>" + options.text.onAirToday + "</h3>";
@@ -50,7 +52,7 @@
         }
 
         function getServerData(){
-            $.ajax({ url: options.sourceDomain + "api/today-info/", dataType:"jsonp", success:function(data){
+            $.ajax({ url: options.sourceDomain + "api/live-info/", dataType:"jsonp", success:function(data){
                         processData(data);
                   }, error:airtimeScheduleJsonpError});
             setTimeout(getServerData, options.updatePeriod*1000);