diff --git a/university-of-south-australia-2017-harvard.csl b/university-of-south-australia-2017-harvard.csl
index d9d9d9bcb2..31b14c8bf6 100644
--- a/university-of-south-australia-2017-harvard.csl
+++ b/university-of-south-australia-2017-harvard.csl
@@ -15,7 +15,7 @@
     <category citation-format="author-date"/>
     <category field="generic-base"/>
     <summary>University of South Australia citation style based on the January 2017 version of the style guide titled Harvard referencing guide UniSA</summary>
-    <updated>2018-08-20T03:25:46+00:00</updated>
+    <updated>2018-09-13T06:23:02+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale xml:lang="en">
@@ -93,33 +93,60 @@
     </choose>
   </macro>
   <macro name="author">
-    <names variable="author">
-      <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with="" delimiter=", " delimiter-precedes-last="never"/>
-      <label form="short" prefix=" (" suffix=")" strip-periods="true"/>
-      <substitute>
-        <text macro="noauthor_editor"/>
-        <text macro="noauthor_title"/>
-      </substitute>
-    </names>
     <choose>
-      <if type="motion_picture">
-        <choose>
-          <if variable="author">
-            <text term="director" form="short" prefix=" (" suffix=")"/>
-          </if>
-        </choose>
+      <if type="motion_picture broadcast" match="any">
+        <names variable="director">
+          <name and="symbol" delimiter-precedes-last="never" initialize-with="" name-as-sort-order="all"/>
+          <label form="short" prefix=" (" suffix=")"/>
+          <substitute>
+            <names variable="author">
+              <name and="symbol" delimiter-precedes-last="never" initialize-with="" name-as-sort-order="all"/>
+            </names>
+            <text macro="noauthor_editor"/>
+            <text macro="noauthor_title"/>
+          </substitute>
+        </names>
       </if>
+      <else>
+        <names variable="author">
+          <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with="" delimiter=", " delimiter-precedes-last="never"/>
+          <label form="short" prefix=" (" suffix=")" strip-periods="true"/>
+          <substitute>
+            <text macro="noauthor_editor"/>
+            <text macro="noauthor_title"/>
+          </substitute>
+        </names>
+      </else>
     </choose>
   </macro>
   <macro name="author-short">
-    <names variable="author">
-      <label form="short" suffix=" " strip-periods="true"/>
-      <name form="short" name-as-sort-order="all" and="symbol" sort-separator=", " delimiter=", " delimiter-precedes-last="never" initialize-with=""/>
-      <substitute>
-        <names variable="editor"/>
-        <text macro="noauthor_title"/>
-      </substitute>
-    </names>
+    <choose>
+      <if type="broadcast motion_picture" match="any">
+        <names variable="director">
+          <name form="short" and="symbol" delimiter-precedes-last="never" initialize-with="" name-as-sort-order="all"/>
+          <substitute>
+            <names variable="author">
+              <name form="short" and="symbol" delimiter-precedes-last="never" initialize-with="" name-as-sort-order="all"/>
+            </names>
+            <names variable="editor">
+              <label form="short"/>
+              <name form="short" and="symbol" delimiter-precedes-last="never" initialize-with="" name-as-sort-order="all"/>
+            </names>
+            <text macro="noauthor_title"/>
+          </substitute>
+        </names>
+      </if>
+      <else>
+        <names variable="author">
+          <label form="short" suffix=" " strip-periods="true"/>
+          <name form="short" name-as-sort-order="all" and="symbol" sort-separator=", " delimiter=", " delimiter-precedes-last="never" initialize-with=""/>
+          <substitute>
+            <names variable="editor"/>
+            <text macro="noauthor_title"/>
+          </substitute>
+        </names>
+      </else>
+    </choose>
   </macro>
   <macro name="title">
     <choose>
@@ -167,14 +194,10 @@
     </choose>
   </macro>
   <macro name="day-month-date">
-    <choose>
-      <if type="article-newspaper report post post-weblog song" match="any">
-        <date variable="issued">
-          <date-part name="day" form="numeric" suffix=" "/>
-          <date-part name="month" form="long"/>
-        </date>
-      </if>
-    </choose>
+    <date variable="issued">
+      <date-part name="day" form="numeric" suffix=" "/>
+      <date-part name="month" form="long"/>
+    </date>
   </macro>
   <macro name="edition">
     <choose>
@@ -191,7 +214,7 @@
   </macro>
   <macro name="format">
     <choose>
-      <if type="song motion_picture" match="any">
+      <if type="song motion_picture broadcast" match="any">
         <text variable="medium"/>
       </if>
       <else>
@@ -222,6 +245,7 @@
       <else-if type="webpage">
         <text variable="container-title"/>
       </else-if>
+      <else-if type="motion_picture" match="any"/>
       <else>
         <text variable="container-title" font-style="italic"/>
       </else>
@@ -303,7 +327,6 @@
             <text macro="title"/>
             <text macro="editor"/>
             <text macro="translator"/>
-            <text macro="format"/>
             <choose>
               <if type="legal_case" match="any">
                 <group delimiter=" ">
@@ -316,12 +339,22 @@
               <else>
                 <text macro="container"/>
                 <text macro="edition"/>
+                <text macro="format"/>
                 <text variable="number"/>
-                <text macro="day-month-date"/>
+                <choose>
+                  <if type="article-newspaper report post post-weblog song" match="any">
+                    <text macro="day-month-date"/>
+                  </if>
+                </choose>
                 <text macro="volume"/>
                 <text variable="collection-title"/>
                 <text macro="publisher"/>
                 <text macro="publisher-place"/>
+                <choose>
+                  <if type="motion_picture broadcast" match="any">
+                    <text macro="day-month-date"/>
+                  </if>
+                </choose>
                 <text macro="issue"/>
                 <text macro="pages"/>
                 <text macro="access"/>