diff --git a/sites/all/modules/unl/unl_migration.php b/sites/all/modules/unl/unl_migration.php
index aaf65715ff6c92b399de3b78e383109977c4206f..b2bbc16eaa31f130d3c972b6d4a17dcfd4148f16 100644
--- a/sites/all/modules/unl/unl_migration.php
+++ b/sites/all/modules/unl/unl_migration.php
@@ -72,18 +72,19 @@ class Unl_Migration_Tool
 
     private $_curl;
 
-    private $_siteMap            = array();
-    private $_processedPages     = array();
-    private $_content            = array();
-    private $_createdContent     = array();
-    private $_lastModifications  = array();
-    private $_hrefTransform      = array();
-    private $_hrefTransformFiles = array();
-    private $_menu               = array();
-    private $_nodeMap            = array();
-    private $_pageTitles         = array();
-    private $_log                = array();
-    private $_blocks             = array();
+    private $_siteMap             = array();
+    private $_processedPages      = array();
+    private $_processedPageHashes = array();
+    private $_content             = array();
+    private $_createdContent      = array();
+    private $_lastModifications   = array();
+    private $_hrefTransform       = array();
+    private $_hrefTransformFiles  = array();
+    private $_menu                = array();
+    private $_nodeMap             = array();
+    private $_pageTitles          = array();
+    private $_log                 = array();
+    private $_blocks              = array();
     
     /**
      * Keep track of the state of the migration progress so that we can resume later
@@ -397,6 +398,14 @@ class Unl_Migration_Tool
             $this->_log('The file at ' . $fullPath . ' was empty! Ignoring.');
             return;
         }
+        
+        $pageHash = hash('md5', $data['content']);
+        if (($matchingPath = array_search($pageHash, $this->_processedPageHashes)) !== FALSE) {
+            $this->_log("The file found at $fullPath was a duplicate of the file at {$this->_baseUrl}$matchingPath ! Ignoring.");
+            return;
+        }
+        $this->_processedPageHashes[$path] = $pageHash; 
+        
         if ($data['lastModified']) {
             $this->_lastModifications[$path] = $data['lastModified'];
         }
@@ -739,10 +748,24 @@ class Unl_Migration_Tool
                       $content_start + strlen($start_token),
                       $content_end - $content_start - strlen($start_token));
     $content = trim($content);
-    if (!$content || $content_start === FALSE || $content_end === FALSE) {
-      return FALSE;
+    if ($content && $content_start !== FALSE && $content_end !== FALSE) {
+      return $content;
+    }
+    
+    $start_token = '<!-- TemplateBeginEditable name="' . $name . '" -->';
+    $end_token = '<!-- TemplateEndEditable -->';
+    
+    $content_start = strpos($html, $start_token);
+    $content_end = strpos($html, $end_token, $content_start);
+    $content = substr($html,
+                      $content_start + strlen($start_token),
+                      $content_end - $content_start - strlen($start_token));
+    $content = trim($content);
+    if ($content && $content_start !== FALSE && $content_end !== FALSE) {
+      return $content;
     }
-    return $content;
+    
+    return FALSE;
   }
 }