diff --git a/config/deploy b/config/deploy
index 279aba8..b57eec5 160000
--- a/config/deploy
+++ b/config/deploy
@@ -1 +1 @@
-Subproject commit 279aba82fb32d0e4824f480523d7be0c493b8952
+Subproject commit b57eec574b22fd65f5b4ea0da031ab40e881b3ca
diff --git a/script/export_all_xml b/script/export_all_xml
index 4353a31..77c8355 100644
--- a/script/export_all_xml
+++ b/script/export_all_xml
@@ -1,15 +1,8 @@
-i = 0
-while true do
-  assets = Asset.find(:all, :limit => 1000, :offset => i)
-  if assets.count > 0
-    assets.each do |asset|
-      filename = "/tmp/pbcore_export/" + asset.uuid + ".xml"
-      file = File.open(filename, "w")
-      file.puts asset.to_xml
-      file.close
-    end
-    i += 1000
-  else
-    break
+Asset.find_in_batches(:batch_size => 100 ) do |assets|
+  assets.each do |asset|
+    filename = "/tmp/pbcore_export/" + asset.uuid + ".xml"
+    file = File.open(filename, "w")
+    file.puts asset.to_xml
+    file.close
   end
-end
\ No newline at end of file
+end