diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/Date.java b/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/Date.java
index 993d2068..6ecc8611 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/Date.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/Date.java
@@ -133,7 +133,18 @@ public class Date implements Comparable<Date> {
     }
 
     public Date stepForward(int years, int months, int days) {
-        Calendar c = Calendar.getInstance();
+        this.day += days;
+        if (day > daysInMonth()) {
+            day -= daysInMonth();
+            month++;
+        }
+        this.month += months;
+        if (month > 12) {
+            month -= 12;
+            year++;
+        }
+        this.year += years;
+        /*Calendar c = Calendar.getInstance();
         int newMonth = month + months;
         if (newMonth > 12) {
             newMonth = 1;
@@ -143,7 +154,7 @@ public class Date implements Comparable<Date> {
         c.setTimeInMillis(c.getTimeInMillis() + days * 24 * 60 * 60 * 1000);
         this.year = c.get(Calendar.YEAR);
         this.month = c.get(Calendar.MONTH) + 1;
-        this.day = c.get(Calendar.DAY_OF_MONTH);
+        this.day = c.get(Calendar.DAY_OF_MONTH);*/
         return this;
     }
 
@@ -165,6 +176,25 @@ public class Date implements Comparable<Date> {
     public boolean isLeap() {
         return ((year & 3) == 0) && ((year % 100) != 0 || (year % 400) == 0);
     }
+    public int daysInMonth() {
+        switch (month) {
+            case 1:
+            case 3:
+            case 5:
+            case 7:
+            case 8:
+            case 10:
+            case 12:
+                return 31;
+            case 2: return isLeap() ? 29 : 28;
+            case 4:
+            case 6:
+            case 9:
+            case 11:
+                return 30;
+        }
+        return 31;
+    }
 
     public String getStringYmd() {
         return year + (month < 10 ? "0" : "") + month + (day < 10 ? "0" : "") + day;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/Time.java b/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/Time.java
index 866b530d..3b951751 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/Time.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/Time.java
@@ -1,10 +1,11 @@
 package pl.szczodrzynski.edziennik.utils.models;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import java.util.Calendar;
 
-public class Time {
+public class Time implements Comparable<Time> {
     public int hour = 0;
     public int minute = 0;
     public int second = 0;
@@ -175,6 +176,11 @@ public class Time {
         return (currentTime.getValue() >= startTime.getValue() && currentTime.getValue() <= endTime.getValue());
     }
 
+    @Override
+    public int compareTo(@NonNull Time o) {
+        return this.getValue() - o.getValue();
+    }
+
     @Override
     public boolean equals(@Nullable Object obj) {
         return obj instanceof Time && this.getValue() == ((Time) obj).getValue();