diff --git a/public/index.html b/public/index.html
index a8899e0..415789d 100644
--- a/public/index.html
+++ b/public/index.html
@@ -17,53 +17,53 @@ <h1>Manual testing of table sort js</h1>
           <th>Department</th>
           <th>Runtime</th>
           <th class="onload-sort">File Size</th>
-          <th>dates in dd/mm/yyyy</th>
           <th class="data-sort">data-sort days</th>
+          <th>dates in dd/mm/yyyy</th>
         </tr>
       </thead>
       <tr class="table-row-1">
         <td>Franklin</td>
         <td>Benjamin</td>
-        <td>1706/1/17</td>
+        <td>1706-1-17</td>
         <td>1</td>
         <td>k-level</td>
         <td>1h 1m 17s</td>
         <td>10b</td>
-        <td>17/6/1978</td>
         <td data-sort="2">Tuesday</td>
+        <td>17/6/1978</td>
       </tr>
       <tr class="table-row-2">
         <td>da Vinci</td>
         <td>Zarlo</td>
-        <td>1452/4/15</td>
+        <td>1452-4-15</td>
         <td>13000</td>
         <td></td>
         <td>1m 45s</td>
         <td>192038998987021b</td>
-        <td>18/10/2027</td>
         <td data-sort="3">Wednesday</td>
+        <td>18/10/2027</td>
       </tr>
       <tr>
         <td>Statham</td>
         <td>Jason</td>
-        <td>1967/7/26</td>
+        <td>1967-7-26</td>
         <td></td>
         <td>HR</td>
         <td>11m 40s</td>
         <td>134809b</td>
-        <td>4/9/2008</td>
         <td data-sort="5">Friday</td>
+        <td>4/9/2008</td>
       </tr>
       <tr>
         <td>Micheal</td>
         <td>Angelo</td>
-        <td>1958/8/21</td>
+        <td>1958-8-21</td>
         <td>54</td>
         <td>Marketing</td>
         <td>29s</td>
         <td>30980980b</td>
-        <td>2/3/1879</td>
         <td data-sort="4">Thursday</td>
+        <td>2/3/1879</td>
       </tr>
 
       <tr>
@@ -74,9 +74,88 @@ <h1>Manual testing of table sort js</h1>
         <td>Marketing</td>
         <td>41s</td>
         <td>902938402398b</td>
-        <td>8/6/1978</td>
         <td data-sort="1">Monday</td>
+        <td>8/6/1978</td>
       </tr>
     </table>
+    <H2>Testing table containing colspan and data-sort</H2>
+ <table class="available table-sort table-arrows">
+        <thead>
+            <tr>
+                <th class="disable-sort"></th>
+                <th class="">Category</th>
+                <th class="show_name">Show</th>
+                <th colspan="2" class="data-sort">Overall</th>
+                <th colspan="2" class="data-sort">On Our Dates</th>
+                <th >First Sold Out</th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr>
+                <td class="tags"></td>
+                <td class="category">Comedy</td> <td class="show_name">Show 1</td>
+                <td class="ratio all" data-sort="72">18/25</td>
+                <td class="pct all">72%</td>
+                <td class="ratio ours" data-sort="75">3/4</td>
+                <td class="pct ours">75%</td>
+                <td>1999-07-30</td>
+            </tr><tr>
+                <td class="tags"></td>
+                <td class="category">Music</td>
+                <td class="show_name">Show 2</td>
+                <td class="ratio all" data-sort="60">6/10</td>
+                <td class="pct all">60%</td>
+                <td class="ratio ours" data-sort="75">3/4</td>
+                <td class="pct ours">75%</td>
+                <td>1999-08-04</td>
+            </tr><tr>
+                <td class="tags"></td>
+                <td class="category">Theatre</td>
+                <td class="show_name">Show 3</td>
+                <td class="ratio all" data-sort="47">7/15</td>
+                <td class="pct all">47%</td>
+                <td class="ratio ours" data-sort="75">3/4</td>
+                <td class="pct ours">75%</td>
+                <td>1999-07-19</td>
+            </tr><tr>
+                <td class="tags"></td>
+                <td class="category">Comedy</td>
+                <td class="show_name">Show 4</td>
+                <td class="ratio all" data-sort="67">10/15</td>
+                <td class="pct all">67%</td>
+                <td class="ratio ours" data-sort="67">2/3</td>
+                <td class="pct ours">67%</td>
+                <td>1999-07-19</td>
+            </tr><tr>
+                <td class="tags"></td>
+                <td class="category">Comedy</td>
+                <td class="show_name">Show 5</td>
+                <td class="ratio all" data-sort="75">9/12</td>
+                <td class="pct all">75%</td>
+                <td class="ratio ours" data-sort="50">1/2</td>
+                <td class="pct ours">50%</td>
+                <td>1999-07-29</td>
+            </tr><tr>
+                <td class="tags"></td>
+                <td class="category">Comedy</td>
+                <td class="show_name">Show 6</td>
+                <td class="ratio all" data-sort="67">16/24</td>
+                <td class="pct all">67%</td>
+                <td class="ratio ours" data-sort="50">2/4</td>
+                <td class="pct ours">50%</td>
+                <td>1999-07-26</td>
+            </tr><tr>
+                <td class="tags"></td>
+                <td class="category">Comedy</td>
+                <td class="show_name">Show 7</td>
+                <td class="ratio all" data-sort="62">16/26</td>
+                <td class="pct all">62%</td>
+                <td class="ratio ours" data-sort="50">2/4</td>
+                <td class="pct ours">50%</td>
+                <td>2022-07-31</td>
+            </tr>
+        </tbody>
+    </table>
   </body>
 </html>
+
diff --git a/public/table-sort.js b/public/table-sort.js
index 05ad269..385b443 100644
--- a/public/table-sort.js
+++ b/public/table-sort.js
@@ -136,16 +136,16 @@ function tableSortJs(testingTableSortJS = false, domDocumentWindow = document) {
       th.insertAdjacentText("beforeend", arrowUp);
     }
 
-    function sortDataAttributes(tableRows, columnData) {
+    function sortDataAttributes(tableRows, column) {
       for (let [i, tr] of tableRows.entries()) {
-        const dataAttributeTd = tr.querySelectorAll("td").item(columnIndex)
-          .dataset.sort;
-        columnData.push(`${dataAttributeTd}#${i}`);
-        columnIndexAndTableRow[columnData[i]] = tr.outerHTML;
+        let dataAttributeTd = getColumn(tr, column.spanSum, column.span).dataset
+          .sort;
+        column.toBeSorted.push(`${dataAttributeTd}#${i}`);
+        columnIndexAndTableRow[column.toBeSorted[i]] = tr.outerHTML;
       }
     }
 
-    function sortFileSize(tableRows, columnData) {
+    function sortFileSize(tableRows, column) {
       let unitToMultiplier = {
         b: 1,
         kb: 1000,
@@ -167,25 +167,23 @@ function tableSortJs(testingTableSortJS = false, domDocumentWindow = document) {
           let number = parseFloat(match[1]);
           let unit = match[2].toLowerCase();
           let multiplier = unitToMultiplier[unit];
-          columnData.push(`${number * multiplier}#${i}`);
+          column.toBeSorted.push(`${number * multiplier}#${i}`);
         } else {
-          columnData.push(`${fillValue}#${i}`);
+          column.toBeSorted.push(`${fillValue}#${i}`);
         }
       }
     }
 
-    function sortByRuntime(tableRows, columnData) {
+    function sortByRuntime(tableRows, column) {
       try {
         for (let [i, tr] of tableRows.entries()) {
           const regexMinutesAndSeconds = /^(\d+h)?\s?(\d+m)?\s?(\d+s)?$/i;
           let columnOfTd = "";
           // TODO: github actions runtime didn't like textContent, tests didn't like innerText?
           if (testingTableSortJS) {
-            columnOfTd = tr
-              .querySelectorAll("td")
-              .item(columnIndex).textContent;
+            columnOfTd = getColumn(tr, column.spanSum, column.span).textContent;
           } else {
-            columnOfTd = tr.querySelectorAll("td").item(columnIndex).innerText;
+            columnOfTd = getColumn(tr, column.spanSum, column.span).innerText;
           }
           let match = columnOfTd.match(regexMinutesAndSeconds);
           let [minutesInSeconds, hours, seconds] = [0, 0, 0];
@@ -205,15 +203,15 @@ function tableSortJs(testingTableSortJS = false, domDocumentWindow = document) {
             }
             timeinSeconds = hours + minutesInSeconds + seconds;
           }
-          columnData.push(`${timeinSeconds}#${i}`);
-          columnIndexAndTableRow[columnData[i]] = tr.outerHTML;
+          column.toBeSorted.push(`${timeinSeconds}#${i}`);
+          columnIndexAndTableRow[column.toBeSorted[i]] = tr.outerHTML;
         }
       } catch (e) {
         console.log(e);
       }
     }
 
-    function sortDates(datesFormat, tableRows, columnData) {
+    function sortDates(datesFormat, tableRows, column) {
       try {
         for (let [i, tr] of tableRows.entries()) {
           let columnOfTd, datesRegex;
@@ -222,7 +220,7 @@ function tableSortJs(testingTableSortJS = false, domDocumentWindow = document) {
           } else if (datesFormat === "ymd") {
             datesRegex = /^(\d\d\d\d)[./-](\d\d?)[./-](\d\d?)/;
           }
-          columnOfTd = tr.querySelectorAll("td").item(columnIndex).textContent;
+          columnOfTd = getColumn(tr, column.spanSum, column.span).textContent;
           let match = columnOfTd.match(datesRegex);
           let [years, days, months] = [0, 0, 0];
           let numberToSort = columnOfTd;
@@ -243,8 +241,8 @@ function tableSortJs(testingTableSortJS = false, domDocumentWindow = document) {
                 String(days).padStart(2, "0")
             );
           }
-          columnData.push(`${numberToSort}#${i}`);
-          columnIndexAndTableRow[columnData[i]] = tr.outerHTML;
+          column.toBeSorted.push(`${numberToSort}#${i}`);
+          columnIndexAndTableRow[column.toBeSorted[i]] = tr.outerHTML;
         }
       } catch (e) {
         console.log(e);
@@ -268,41 +266,47 @@ function tableSortJs(testingTableSortJS = false, domDocumentWindow = document) {
       }
     }
 
-    function getColSpanData(sortableTable, colSpanData, colSpanSum) {
+    function getColSpanData(sortableTable, column) {
       sortableTable.querySelectorAll("th").forEach((th, index) => {
-        colSpanData[index] = th.colSpan;
-        if (index === 0) colSpanSum[index] = th.colSpan;
-        else colSpanSum[index] = colSpanSum[index - 1] + th.colSpan;
+        column.span[index] = th.colSpan;
+        if (index === 0) column.spanSum[index] = th.colSpan;
+        else column.spanSum[index] = column.spanSum[index - 1] + th.colSpan;
       });
     }
 
+    function getColumn(tr, colSpanSum, colSpanData) {
+      return tr
+        .querySelectorAll("td")
+        .item(
+          colSpanData[columnIndex] === 1
+            ? colSpanSum[columnIndex] - 1
+            : colSpanSum[columnIndex] - colSpanData[columnIndex]
+        );
+    }
+
     function getTableData(tableProperties) {
       const {
         tableRows,
-        columnData,
+        column,
         isFileSize,
         isTimeSort,
         isSortDateDayMonthYear,
         isSortDateMonthDayYear,
         isSortDateYearMonthDay,
         isDataAttribute,
-        colSpanData,
-        colSpanSum,
       } = tableProperties;
       for (let [i, tr] of tableRows.entries()) {
-        let tdTextContent = tr
-          .querySelectorAll("td")
-          .item(
-            colSpanData[columnIndex] === 1
-              ? colSpanSum[columnIndex] - 1
-              : colSpanSum[columnIndex] - colSpanData[columnIndex]
-          ).textContent;
+        let tdTextContent = getColumn(
+          tr,
+          column.spanSum,
+          column.span
+        ).textContent;
         if (tdTextContent.length === 0) {
           tdTextContent = "";
         }
         if (tdTextContent.trim() !== "") {
           if (isFileSize) {
-            fileSizeColumnTextAndRow[columnData[i]] = tr.outerHTML;
+            fileSizeColumnTextAndRow[column.toBeSorted[i]] = tr.outerHTML;
           }
           // These classes already handle pushing to column and setting the tr html.
           if (
@@ -313,12 +317,12 @@ function tableSortJs(testingTableSortJS = false, domDocumentWindow = document) {
             !isSortDateYearMonthDay &&
             !isSortDateMonthDayYear
           ) {
-            columnData.push(`${tdTextContent}#${i}`);
+            column.toBeSorted.push(`${tdTextContent}#${i}`);
             columnIndexAndTableRow[`${tdTextContent}#${i}`] = tr.outerHTML;
           }
         } else {
           // Fill in blank table cells dict key with filler value.
-          columnData.push(`${fillValue}#${i}`);
+          column.toBeSorted.push(`${fillValue}#${i}`);
           columnIndexAndTableRow[`${fillValue}#${i}`] = tr.outerHTML;
         }
       }
@@ -348,7 +352,7 @@ function tableSortJs(testingTableSortJS = false, domDocumentWindow = document) {
         th.innerHTML = th.innerHTML.replace(arrowDown, "");
       }
 
-      if (columnData[0] === undefined) {
+      if (column.toBeSorted[0] === undefined) {
         return;
       }
 
@@ -360,7 +364,7 @@ function tableSortJs(testingTableSortJS = false, domDocumentWindow = document) {
       }
 
       function sortColumn(sortDirection) {
-        columnData.sort(sortDirection, {
+        column.toBeSorted.sort(sortDirection, {
           numeric: !isAlphaSort,
           ignorePunctuation: !isPunctSort,
         });
@@ -387,10 +391,10 @@ function tableSortJs(testingTableSortJS = false, domDocumentWindow = document) {
     }
 
     function updateTable(tableProperties) {
-      const { tableRows, columnData, isFileSize } = tableProperties;
+      const { tableRows, column, isFileSize } = tableProperties;
       for (let [i, tr] of tableRows.entries()) {
         if (isFileSize) {
-          tr.innerHTML = fileSizeColumnTextAndRow[columnData[i]];
+          tr.innerHTML = fileSizeColumnTextAndRow[column.toBeSorted[i]];
           let fileSizeInBytesHTML = tr
             .querySelectorAll("td")
             .item(columnIndex).innerHTML;
@@ -398,8 +402,8 @@ function tableSortJs(testingTableSortJS = false, domDocumentWindow = document) {
             .querySelectorAll("td")
             .item(columnIndex).textContent;
           // Remove the unique identifyer for duplicate values(#number).
-          columnData[i] = columnData[i].replace(/#[0-9]*/, "");
-          const fileSize = parseFloat(columnData[i]);
+          column.toBeSorted[i] = column.toBeSorted[i].replace(/#[0-9]*/, "");
+          const fileSize = parseFloat(column.toBeSorted[i]);
           let prefixes = ["", "Ki", "Mi", "Gi", "Ti", "Pi"];
           let replaced = false;
           for (let i = 0; i < prefixes.length; ++i) {
@@ -423,13 +427,19 @@ function tableSortJs(testingTableSortJS = false, domDocumentWindow = document) {
           tr.querySelectorAll("td").item(columnIndex).innerHTML =
             fileSizeInBytesHTML;
         } else if (!isFileSize) {
-          tr.outerHTML = columnIndexAndTableRow[columnData[i]];
+          tr.outerHTML = columnIndexAndTableRow[column.toBeSorted[i]];
         }
       }
     }
 
     th.addEventListener("click", function () {
-      const [columnData, colSpanData, colSpanSum] = [[], {}, {}];
+      timesClickedColumn += 1;
+      const column = {
+        // column used for sorting; better name?
+        toBeSorted: [],
+        span: {},
+        spanSum: {},
+      };
 
       const visibleTableRows = Array.prototype.filter.call(
         tableBody.querySelectorAll("tr"),
@@ -438,19 +448,21 @@ function tableSortJs(testingTableSortJS = false, domDocumentWindow = document) {
         }
       );
 
+      getColSpanData(sortableTable, column);
+
       const isDataAttribute = th.classList.contains("data-sort");
       if (isDataAttribute) {
-        sortDataAttributes(visibleTableRows, columnData);
+        sortDataAttributes(visibleTableRows, column);
       }
 
       const isFileSize = th.classList.contains("file-size-sort");
       if (isFileSize) {
-        sortFileSize(visibleTableRows, columnData);
+        sortFileSize(visibleTableRows, column);
       }
 
       const isTimeSort = th.classList.contains("runtime-sort");
       if (isTimeSort) {
-        sortByRuntime(visibleTableRows, columnData);
+        sortByRuntime(visibleTableRows, column);
       }
 
       const isSortDateDayMonthYear = th.classList.contains("dates-dmy-sort");
@@ -458,11 +470,11 @@ function tableSortJs(testingTableSortJS = false, domDocumentWindow = document) {
       const isSortDateYearMonthDay = th.classList.contains("dates-ymd-sort");
       // pick mdy first to override the inferred default class which is dmy.
       if (isSortDateMonthDayYear) {
-        sortDates("mdy", visibleTableRows, columnData);
+        sortDates("mdy", visibleTableRows, column);
       } else if (isSortDateYearMonthDay) {
-        sortDates("ymd", visibleTableRows, columnData);
+        sortDates("ymd", visibleTableRows, column);
       } else if (isSortDateDayMonthYear) {
-        sortDates("dmy", visibleTableRows, columnData);
+        sortDates("dmy", visibleTableRows, column);
       }
 
       const isRememberSort = sortableTable.classList.contains("remember-sort");
@@ -470,20 +482,15 @@ function tableSortJs(testingTableSortJS = false, domDocumentWindow = document) {
         rememberSort(timesClickedColumn, columnIndexesClicked);
       }
 
-      timesClickedColumn += 1;
-
-      getColSpanData(sortableTable, colSpanData, colSpanSum);
       const tableProperties = {
         tableRows: visibleTableRows,
-        columnData,
+        column,
         isFileSize,
         isSortDateDayMonthYear,
         isSortDateMonthDayYear,
         isSortDateYearMonthDay,
         isDataAttribute,
         isTimeSort,
-        colSpanData,
-        colSpanSum,
       };
       getTableData(tableProperties);
       updateTable(tableProperties);
diff --git a/test/table.test.js b/test/table.test.js
index a0b2395..f2139c0 100644
--- a/test/table.test.js
+++ b/test/table.test.js
@@ -166,6 +166,38 @@ test("data-sort: example days of week", () => {
   });
 });
 
+test("data-sort clicked twice: example days of week", () => {
+  expect(
+    createTestTable(
+      {
+        col0: [
+          "Saturday",
+          "Wednesday",
+          "Sunday",
+          "Friday",
+          "Thursday",
+          "Tuesday",
+          "Monday",
+        ],
+      },
+      { classTags: "data-sort" },
+      {
+        colsToClick: [0, 0],
+      }
+    )
+  ).toStrictEqual({
+    col0: [
+      "Monday",
+      "Tuesday",
+      "Thursday",
+      "Friday",
+      "Sunday",
+      "Wednesday",
+      "Saturday",
+    ],
+  });
+});
+
 test("disable-sort: disable sorting on a column", () => {
   expect(
     createTestTable(