diff --git a/delivery/src/main/java/org/hso/ecommerce/supplier/data/Delivery.java b/delivery/src/main/java/org/hso/ecommerce/supplier/data/Delivery.java
index 1e4e6ce..1c3e9b4 100644
--- a/delivery/src/main/java/org/hso/ecommerce/supplier/data/Delivery.java
+++ b/delivery/src/main/java/org/hso/ecommerce/supplier/data/Delivery.java
@@ -8,12 +8,15 @@ import java.util.UUID;
 
 public class Delivery {
 
-    private String[] states = {"Bestellung eingegangen","Bestellung auf dem Weg","Lieferung erfolgreich"};
-    private int[] timeBorder = {4,24};
+    private String[] states = {"Bestellung eingegangen", "Bestellung auf dem Weg", "Lieferung erfolgreich"};
+    private int[] timeBorder = {4, 24};
 
     private String name;
     private String address;
+
+    // Why is this a string and creationTime a Date?!
     private String estimatedArrival;
+
     private Date creationTime;
     private String uuid;
 
@@ -29,6 +32,9 @@ public class Delivery {
     public static Delivery lostDelivery(String uuid) {
         Delivery delivery = new Delivery("", "");
         delivery.uuid = uuid;
+        delivery.creationTime = addDays(new Date(), -1);
+        SimpleDateFormat formatter = new SimpleDateFormat("dd-MM-yyyy");
+        delivery.estimatedArrival = formatter.format(addDays((Date) delivery.creationTime.clone(), 1));
         return delivery;
     }
 
@@ -37,6 +43,7 @@ public class Delivery {
         long timeNow = now.getTime();
         long creationTime = this.creationTime.getTime();
 
+        // Wow, that's how calculate date diffs.
         long diff = timeNow - creationTime;
         double hour = (((diff / 1000.0) / 3600.0));
 
@@ -54,8 +61,7 @@ public class Delivery {
         return estimatedArrival;
     }
 
-    private Date addDays(Date date, int days)
-    {
+    private static Date addDays(Date date, int days) {
         Calendar cal = Calendar.getInstance();
         cal.setTime(date);
         cal.add(Calendar.DATE, days);