--- a/aws/busuiphp.sh
+++ b/aws/busuiphp.sh
@@ -1,4 +1,6 @@
 cp /root/aws.php /tmp/
+chmod  777 /var/cache/lighttpd/compress/
+
 mkdir /var/www/lib/staticmaplite/cache 
 chcon -h system_u:object_r:httpd_sys_content_t /var/www
 chcon -R -h root:object_r:httpd_sys_content_t /var/www/*
@@ -15,3 +17,4 @@
 
 wget http://s3-ap-southeast-1.amazonaws.com/busresources/cbrfeed.zip \
 -O /var/www/cbrfeed.zip
+

--- a/include/common.inc.php
+++ b/include/common.inc.php
@@ -48,6 +48,8 @@
 $basePath = "";
 if (strstr($_SERVER['PHP_SELF'], "labs/")
         || strstr($_SERVER['PHP_SELF'], "myway/")
+        || strstr($_SERVER['PHP_SELF'], "lib/")
+        || strstr($_SERVER['PHP_SELF'], "include/")
         || strstr($_SERVER['PHP_SELF'], "servicealerts/"))
     $basePath = "../";
 

--- a/myway/myway_api.json.php
+++ b/myway/myway_api.json.php
@@ -33,8 +33,8 @@
   }
   } */
 //set POST variables
-$url = 'https://www.transport.act.gov.au/ARTS/use_Funcs.asp';
-//$url = 'http://localhost/myway.html';
+$url = 'https://www.action.act.gov.au/ARTS/use_Funcs.asp';
+//$url = 'http://localhost/myway.htm';
 $field_mapping = Array(
     "card_number" => "SRNO",
     "DOBmonth" => "month",
@@ -81,7 +81,7 @@
     curl_setopt($ch, CURLOPT_POST, count($fields));
     curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-    curl_setopt($ch, CURLOPT_REFERER, "https://www.transport.act.gov.au/ARTS/getbalance.asp");
+    curl_setopt($ch, CURLOPT_REFERER, "https://www.action.act.gov.au/ARTS/getbalance.asp");
     curl_setopt($ch, CURLOPT_HEADER, 0);
     curl_setopt($ch, CURLOPT_TIMEOUT, 30);
     //execute post
@@ -92,8 +92,22 @@
     curl_close($ch);
 }
 
-function parseTable($table,$tableName) {
-    global $return;
+if (!isset($return['error'])) {
+    include_once ('../lib/simple_html_dom.php');
+    //print_r($pageHTML);
+    $page = str_get_html($pageHTML);
+    $pageAlerts = $page->find(".smartCardAlert");
+    if (sizeof($pageAlerts) > 0) {
+        $return['error'][] = $pageAlerts[0]->plaintext;
+    }
+    if (!isset($return['error'])) {
+        $tableNum = 0;
+        $tableName = Array(
+            1 => "myway_carddetails",
+            2 => "myway_transactions"
+        );
+        foreach ($page->find("table") as $table) {
+            $tableNum++;
             $tableColumns = Array();
             $tableColumnNum = 0;
             foreach ($table->find("th") as $th) {
@@ -105,17 +119,17 @@
             foreach ($table->find("tr") as $tr) {
                 $tableColumnNum = 0;
                 foreach ($tr->find("td") as $td) {
-                    if ($tableName ==  "myway_carddetails") {
+                    if ($tableNum == 1) {
                         // first table has card/cardholder details
-                        $return[$tableName][$tableColumns[$tableColumnNum]] = cleanString($td->plaintext);
+                        $return[$tableName[$tableNum]][$tableColumns[$tableColumnNum]] = cleanString($td->plaintext);
                     } else {
                         // second table has transactions
 
                         if ($tableColumns[$tableColumnNum] == "TX Reference No / Type") {
-                            $return[$tableName][$tableRowNum]["TX Reference No"] = substr(cleanString($td->plaintext), 0, 6);
-                            $return[$tableName][$tableRowNum]["TX Type"] = substr(cleanString($td->plaintext), 7);
+                            $return[$tableName[$tableNum]][$tableRowNum]["TX Reference No"] = substr(cleanString($td->plaintext), 0, 6);
+                            $return[$tableName[$tableNum]][$tableRowNum]["TX Type"] = substr(cleanString($td->plaintext), 7);
                         } else {
-                            $return[$tableName][$tableRowNum][$tableColumns[$tableColumnNum]] = cleanString($td->plaintext);
+                            $return[$tableName[$tableNum]][$tableRowNum][$tableColumns[$tableColumnNum]] = cleanString($td->plaintext);
                         }
                     }
                     //print_r($return);
@@ -123,23 +137,7 @@
                 }
                 $tableRowNum++;
             }
-}
-
-if (!isset($return['error'])) {
-    include_once ('../lib/simple_html_dom.php');
-    //print_r($pageHTML);
-    $page = str_get_html($pageHTML);
-    $pageAlerts = $page->find(".smartCardAlert");
-    if (sizeof($pageAlerts) > 0) {
-        $return['error'][] = $pageAlerts[0]->plaintext;
-    }
-    if (!isset($return['error'])) {
-        $tables = $page->find(".type3");
-            parseTable($tables[0], "myway_carddetails");
-      
-        $tables = $page->find(".type2");
-            parseTable($tables[0], "myway_transactions");
-        
+        }
     }
 }
 if (sizeof($return) == 0) {