diff --git a/pom.xml b/pom.xml
index 6cf042f..54e53b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>cz.jzitnik</groupId>
     <artifactId>fit</artifactId>
     <version>1.0-SNAPSHOT</version>
 
+
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
@@ -20,6 +20,34 @@
             <version>21.141.0</version>
         </dependency>
     </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>3.3.0</version>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <mainClass>cz.jzitnik.Main</mainClass>
+                        </manifest>
+                    </archive>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 
 
-</project>
\ No newline at end of file
+
+</project>
diff --git a/src/main/java/cz/jzitnik/CustomFitListener.java b/src/main/java/cz/jzitnik/CustomFitListener.java
index a5bf28e..7cf2531 100644
--- a/src/main/java/cz/jzitnik/CustomFitListener.java
+++ b/src/main/java/cz/jzitnik/CustomFitListener.java
@@ -17,36 +17,28 @@ class CustomFitListener implements MesgListener {
     }
 
     public void modifyData() {
+
+        DateTime latestTime = null;
+
+        for (int i = 0; i < messages.size(); i++) {
+            Mesg mesg = messages.get(i);
+            
+            if (mesg.getNum() == MesgNum.RECORD) {
+                RecordMesg recordMesg = new RecordMesg(mesg);
+                DateTime time = recordMesg.getTimestamp();
+                
+                if (latestTime == null || time.compareTo(latestTime) > 0) {
+                    latestTime = time;
+                }
+            }
+        }
+
         for (int i = 0; i < messages.size(); i++) {
             Mesg mesg = messages.get(i);
             if (mesg.getNum() == MesgNum.EVENT) {
                 EventMesg eventMesg = new EventMesg(mesg);
                 if (eventMesg.getEventType() == EventType.STOP_ALL) {
-                    Scanner scanner = new Scanner(System.in);
-                    System.out.print("Rok: ");
-                    int year = Integer.parseInt(scanner.nextLine());
-
-                    System.out.print("Měsíc: ");
-                    int month = Integer.parseInt(scanner.nextLine()) - 1;
-
-                    System.out.print("Den: ");
-                    int day = Integer.parseInt(scanner.nextLine());
-
-                    System.out.print("Hodina: ");
-                    int hour = Integer.parseInt(scanner.nextLine());
-
-                    System.out.print("Minuta: ");
-                    int minute = Integer.parseInt(scanner.nextLine());
-
-                    System.out.print("Sekunda: ");
-                    int second = Integer.parseInt(scanner.nextLine());
-
-
-                    Calendar calendar = Calendar.getInstance();
-                    calendar.set(year, month, day, hour, minute, second);
-                    Date date = calendar.getTime();
-                    DateTime dateTime = new DateTime(date);
-                    eventMesg.setTimestamp(dateTime);
+                    eventMesg.setTimestamp(latestTime);
                     messages.set(i, eventMesg);
                 }
             }