--- a/ClassPlanShipments.lua	Sun May 28 19:55:26 2017 -0400
+++ b/ClassPlanShipments.lua	Sun May 28 19:58:56 2017 -0400
@@ -107,13 +107,12 @@
       AddShipmentInfo(AK_NOTES, name, texture, shipmentCapacity, shipmentsReady, shipmentsTotal, creationTime, duration, timeleftString)
     end
 
-    local talentTrees = C_Garrison.GetTalentTreeIDsByClassID(garrisonType, select(3, UnitClass("player")));
+    local talentTrees = CG_GetTalentTrees(garrisonType, select(3, UnitClass("player")));
     -- this is a talent that has completed, but has not been seen in the talent UI yet.
     local completeTalentID = CG_GetCompleteTalent(garrisonType);
-    print('Talents:')
+    --print('Talents:')
     if (talentTrees) then
-      for treeIndex, treeID in ipairs(talentTrees) do
-        local _, _, tree = C_Garrison.GetTalentTreeInfoForID(garrisonType, treeID);
+      for treeIndex, tree in ipairs(talentTrees) do
         for talentIndex, talent in ipairs(tree) do
           local showTalent = false;
           if (talent.isBeingResearched) or (talent.id == completeTalentID) then
@@ -211,18 +210,18 @@
 
 ShipmentList.SortHandler = function(a, b)
   local status = false
-  if b.isComplete ~= a.isComplete then
-    if a.isComplete then
-      status = true
-    end
-  else
-    if a[SortKey]  then
-      if b[SortKey] then
-        status = (SortTable[a[SortKey]] < SortTable[b[SortKey]])
-      else
+    if b.isComplete ~= a.isComplete then
+      if a.isComplete then
         status = true
       end
     else
+      if a[SortKey]  then
+        if b[SortKey] then
+          status = (SortTable[a[SortKey]] < SortTable[b[SortKey]])
+        else
+          status = true
+        end
+      else
       if a.profileKey ~= b.profileKey then
           status = (a.profileKey < b.profileKey)