diff --git a/src/components/StationsView/StationCard.vue b/src/components/StationsView/StationCard.vue
index 559d074..1beaf8e 100644
--- a/src/components/StationsView/StationCard.vue
+++ b/src/components/StationsView/StationCard.vue
@@ -182,7 +182,10 @@
                 >Na stacji</span>
 
                 <span style="color: #FF4646" v-else-if="timetable.stopped">Postój</span>
-                <span style="color: #aaa" v-else-if="!timetable.confirmed">W drodze</span>
+                <span
+                  style="color: #aaa"
+                  v-else-if="!timetable.confirmed && timetable.currentStationName != stationInfo.stationName"
+                >W drodze</span>
 
                 <span
                   style="color: red"
@@ -254,8 +257,6 @@ export default class StationCard extends styleMixin {
 
 
   get computedScheduledTrains() {
-    console.log(this.stationInfo.stationName, "test");
-
     return this.stationInfo.scheduledTrains.sort((a, b) => {
       if (a.arrivalTime > b.arrivalTime) return 1;
       else if ((a.arrivalTime < b.arrivalTime)) return -1;
diff --git a/src/store/store.ts b/src/store/store.ts
index cdf3012..b91291a 100644
--- a/src/store/store.ts
+++ b/src/store/store.ts
@@ -131,6 +131,7 @@ export default class Store extends VuexModule {
               stopObj.terminatesHere = getTimestamp(point.departureTime) == 0 ? true : false;
               stopObj.confirmed = point.confirmed;
               stopObj.stopped = point.stopped;
+              stopObj.stopTime = point.pointStopTime;
 
               acc.push(stopObj);
             }
@@ -307,7 +308,7 @@ export default class Store extends VuexModule {
     this.trainList = updatedTrainList.reduce((acc, updatedTrain) => {
       const trainData = this.trainList.find(train => train.trainNo === updatedTrain.trainNo);
 
-      if (trainData) acc.push({ ...updatedTrain, ...trainData });
+      if (trainData) acc.push({ ...trainData, ...updatedTrain });
       else acc.push({ ...updatedTrain });
 
       return acc;
@@ -345,8 +346,6 @@ export default class Store extends VuexModule {
         return acc;
       }, []);
 
-      // console.log('gituwa');
-
       return { ...station, scheduledTrains };
     });