diff --git a/app/controllers/contestants_controller.rb b/app/controllers/contestants_controller.rb
index a8130d6..af90c75 100644
--- a/app/controllers/contestants_controller.rb
+++ b/app/controllers/contestants_controller.rb
@@ -114,7 +114,12 @@ class ContestantsController < ApplicationController
   def export
     authorize @contest
 
-    @contestants = @contest.contestants.sort_by { |contestant| [ -contestant.completions.size, contestant.time_seconds ] }
+    @contestants = @contest.contestants.sort_by { |contestant| [
+      -contestant.completions.where(remaining_pieces: nil).size,
+      (contestant.completions.where(remaining_pieces: nil).size == @contest.puzzles.length ? 1 : 0) * contestant.time_seconds,
+      contestant.completions.size > 0 && contestant.completions[-1].remaining_pieces ? contestant.completions[-1].remaining_pieces : 1000000,
+      contestant.time_seconds
+    ] }
 
     respond_to do |format|
       format.csv do
diff --git a/app/views/contestants/export.csv.slim b/app/views/contestants/export.csv.slim
index 913ee86..ebadd4c 100644
--- a/app/views/contestants/export.csv.slim
+++ b/app/views/contestants/export.csv.slim
@@ -1,4 +1,4 @@
 = CSV.generate_line [t("helpers.rank"), t("activerecord.attributes.contestant.name"), t("activerecord.attributes.contestant.display_time"), t("activerecord.attributes.contestant.completions")]
 
 - @contestants.each_with_index do |contestant, index|
-  = CSV.generate_line([index + 1, contestant.name, contestant.display_time, contestant.completions.length])
\ No newline at end of file
+  = CSV.generate_line([index + 1, contestant.name, contestant.completions.size > 0 && contestant.completions[-1].remaining_pieces ? "#{contestant.completions.map{|completion| completion.puzzle.pieces}.sum - contestant.completions[-1].remaining_pieces}p" : contestant.display_time, contestant.completions.where(remaining_pieces: nil).length])
\ No newline at end of file