diff --git a/src/main/java/ch/zhaw/gartenverwaltung/backgroundtasks/weather/WeatherGradenTaskPlanner.java b/src/main/java/ch/zhaw/gartenverwaltung/backgroundtasks/weather/WeatherGradenTaskPlanner.java
index 55a9bf5..7c6a3ee 100644
--- a/src/main/java/ch/zhaw/gartenverwaltung/backgroundtasks/weather/WeatherGradenTaskPlanner.java
+++ b/src/main/java/ch/zhaw/gartenverwaltung/backgroundtasks/weather/WeatherGradenTaskPlanner.java
@@ -16,7 +16,7 @@ public class WeatherGradenTaskPlanner {
     private final PlantList plantList;
     private final CropList cropList;
     WeatherService weatherService;
-    private final LocalDate dateSevereWeather = LocalDate.of(22,12,15);
+    private final LocalDate dateSevereWeather = LocalDate.of(2022,12,15);
 
     public WeatherGradenTaskPlanner(TaskList taskList, PlantList plantList, CropList cropList) {
         this.taskList = taskList;
@@ -31,7 +31,7 @@ public class WeatherGradenTaskPlanner {
     }
 
     private void getSevereWeatherEvents() throws IOException {
-        SevereWeather actualWeather = weatherService.causeSevereWeather(0);
+        SevereWeather actualWeather = weatherService.causeSevereWeather(1);
         if (SevereWeather.HAIL.equals(actualWeather)) {
             createPreHail();
         } else if (SevereWeather.FROST.equals(actualWeather)) {
@@ -50,8 +50,7 @@ public class WeatherGradenTaskPlanner {
 
         Task preHailTask = new Task("Hail",
                                     "During a summer Thunderstorm it could hail heavily. THe Hail could damage the crops. To prevent damage cover the plants with a strong tarpaulin",
-                                    dateSevereWeather.minusDays(1L));
-        preHailTask.withId(Long.MAX_VALUE);
+                                    dateSevereWeather.minusDays(1L),dateSevereWeather.plusDays(1L));
         taskList.saveTask(preHailTask);
 
     }
@@ -59,16 +58,14 @@ public class WeatherGradenTaskPlanner {
     public void createPreFrost() throws IOException {
         Task preFrostTask = new Task("Frost",
                                     "The temperatur falls below zero degrees, cover especially the root with wool",
-                                    dateSevereWeather.minusDays(1L));
-        preFrostTask.withId(Long.MAX_VALUE);
+                                    dateSevereWeather.minusDays(1L),dateSevereWeather.plusDays(1L));
         taskList.saveTask(preFrostTask);
     }
 
     public void createPreSnow() throws IOException {
         Task preSnowTask = new Task("Snow",
                                     "The weather brings little snowfall. Cover your crops",
-                                    dateSevereWeather.minusDays(1L));
-        preSnowTask.withId(Long.MAX_VALUE);
+                                    dateSevereWeather.minusDays(1L),dateSevereWeather.plusDays(1L));
         taskList.saveTask(preSnowTask);
     }
 
diff --git a/src/main/java/ch/zhaw/gartenverwaltung/types/Task.java b/src/main/java/ch/zhaw/gartenverwaltung/types/Task.java
index c8b976b..ef97003 100644
--- a/src/main/java/ch/zhaw/gartenverwaltung/types/Task.java
+++ b/src/main/java/ch/zhaw/gartenverwaltung/types/Task.java
@@ -44,10 +44,11 @@ public class Task {
     /**
      * Constructor for weather events
     */
-    public Task(String name, String description, LocalDate startDate) {
+    public Task(String name, String description, LocalDate startDate, LocalDate endDate) {
         this.name = name;
         this.description = description;
         this.startDate = startDate;
+        this.endDate = endDate;
     }
 
     public Task(String name, String description, LocalDate startDate, LocalDate endDate, int interval, long cropId) {