diff --git a/tools/cooja/java/se/sics/cooja/interfaces/Battery.java b/tools/cooja/java/se/sics/cooja/interfaces/Battery.java
index 45c8ee71f..50d92bae5 100644
--- a/tools/cooja/java/se/sics/cooja/interfaces/Battery.java
+++ b/tools/cooja/java/se/sics/cooja/interfaces/Battery.java
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: Battery.java,v 1.1 2006/08/21 12:12:59 fros4943 Exp $
+ * $Id: Battery.java,v 1.2 2006/09/26 12:47:06 fros4943 Exp $
  */
 
 package se.sics.cooja.interfaces;
@@ -90,7 +90,8 @@ public class Battery extends MoteInterface implements PassiveMoteInterface {
 
   private double myEnergy;
   private boolean hasInfiniteEnergy;
-
+  private double lastEnergyConsumption = 0;
+  
   /**
    * Creates a new battery connected to given mote.
    * 
@@ -125,6 +126,8 @@ public class Battery extends MoteInterface implements PassiveMoteInterface {
   }
 
   public void doActionsAfterTick() {
+    lastEnergyConsumption = 0;
+    
     // If infinite energy, do nothing
     if (hasInfiniteEnergy)
       return;
@@ -145,6 +148,7 @@ public class Battery extends MoteInterface implements PassiveMoteInterface {
       }
 
       decreaseEnergy(totalEnergyConsumption);
+      lastEnergyConsumption += totalEnergyConsumption;
     } else {
       // Mote is awake. Sum up energy usage.
       double totalEnergyConsumption = 0.0;
@@ -160,6 +164,7 @@ public class Battery extends MoteInterface implements PassiveMoteInterface {
       }
 
       decreaseEnergy(totalEnergyConsumption);
+      lastEnergyConsumption += totalEnergyConsumption;
     }
 
     // Check if we are out of energy
@@ -264,6 +269,10 @@ public class Battery extends MoteInterface implements PassiveMoteInterface {
     return 0.0;
   }
 
+  public double getLastTotalEnergyConsumption() {
+    return lastEnergyConsumption;
+  }
+
   public Collection<Element> getConfigXML() {
     Vector<Element> config = new Vector<Element>();
     Element element;