diff --git a/app/controllers/statuses_controller.rb b/app/controllers/statuses_controller.rb
--- a/app/controllers/statuses_controller.rb
+++ b/app/controllers/statuses_controller.rb
@@ -12,10 +12,8 @@
     @levels = (0..CODEJOM_MAX_ALIVE_LEVEL)
     @levels.each { |l| @level_users[l] = [] }
     User.find(:all).find_all{|user| not user.admin? }.each do |user|
-      if user.codejom_status==nil
-        user.update_codejom_status
-        user.codejom_status(true)  # reload
-      end
+      user.update_codejom_status
+      user.codejom_status(true)  # reload
 
       if not user.codejom_status.alive
         @dead_users << user
@@ -27,10 +25,7 @@
     respond_to do |format|
       format.html 
       format.xml do 
-        render :xml => {
-          :levels => @level_users,
-          :dead_users => @dead_users 
-        } 
+        render :template => 'statuses/index.xml.erb'
       end
     end
   end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -78,11 +78,19 @@
     # if the contest is over
     if Configuration.time_limit_mode?
       if user.contest_finished?
-        header = <<CONTEST_OVER
+        if (user.codejom_status) and (not user.codejom_status.alive)
+          header = <<CONTEST_OVER
+<tr><td colspan="2" align="center">
+<span class="contest-over-msg">BYE-BYE. YOU ARE DEAD</span>
+</td></tr>
+CONTEST_OVER
+        else
+          header = <<CONTEST_OVER
 <tr><td colspan="2" align="center">
 <span class="contest-over-msg">THE CONTEST IS OVER</span>
 </td></tr>
 CONTEST_OVER
+        end
       end
       if !user.contest_started?
         time_left = "&nbsp;&nbsp;" + (t 'title_bar.contest_not_started')
diff --git a/app/models/user.rb b/app/models/user.rb
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -209,7 +209,13 @@
   def contest_finished?
     if Configuration.contest_mode?
       return false if site==nil
-      return site.finished?
+      if site.finished?
+        return true
+      elsif codejom_status!=nil
+        return (not codejom_status.alive)
+      else
+        return false
+      end
     elsif Configuration.indv_contest_mode?
       time_limit = Configuration.contest_time_limit
 
diff --git a/app/views/statuses/index.xml.erb b/app/views/statuses/index.xml.erb
new file mode 100644
--- /dev/null
+++ b/app/views/statuses/index.xml.erb
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<codejom>
+  <% @dead_users.each do |user| %>
+    <node>
+      <name><%= user.login %></name>
+      <depth>100</depth>
+    </node>
+  <% end %>
+  <% @levels.each do |level| %>
+    <% @level_users[level].each do |user| %>
+      <node>
+	<name><%= user.login %></name>
+	<depth><%= level %></depth>
+      </node>
+    <% end %>
+  <% end %>
+</codejom>