diff --git a/_alp/Agents/EnergyModel/Code/Functions.java b/_alp/Agents/EnergyModel/Code/Functions.java
index 4a77f5e..3c814ea 100644
--- a/_alp/Agents/EnergyModel/Code/Functions.java
+++ b/_alp/Agents/EnergyModel/Code/Functions.java
@@ -42,7 +42,7 @@
 b_isLastTimeStepOfDay = t_h % 24 == (24-p_timeStep_h);
 t_hourOfDay = t_h % 24; // Assumes modelrun starts at midnight.
 
-c_profiles.forEach(p -> p.updateValue(t_h));
+c_profiles.forEach(p -> p.updateValue(t_h)); // 
 //v_currentAmbientTemperature_degC = pp_ambientTemperature_degC.getCurrentValue();
 //v_currentWindPowerNormalized_r = pp_windProduction_fr.getCurrentValue();
 //v_currentSolarPowerNormalized_r = pp_PVProduction35DegSouth_fr.getCurrentValue();
@@ -589,44 +589,9 @@ ArrayList<GridConnection> f_getActiveGridConnections()
 if (b_isInitialized) {
 	throw new RuntimeException("Error: Engine was initalized a second time.");
 }
-// Initialize time and date
-//v_hourOfYearStart=hourOfYearPerMonth[getMonth()] + (getDayOfMonth()-1)*24;
-t_h = p_runStartTime_h;
-
-Date startDate = date();
-p_year = startDate.getYear() + 1900;
-
-LocalDate localDate = LocalDate.of(p_year, 1, 1);
-v_dayOfWeek1jan = DayOfWeek.from(localDate).getValue();
-p_startOfWinterWeek_h = roundToInt(24 * (p_winterWeekNumber * 7 + (8-v_dayOfWeek1jan)%7)); // Week 49 is winterweek.
-p_startOfSummerWeek_h = roundToInt(24 * (p_summerWeekNumber * 7 + (8-v_dayOfWeek1jan)%7)); // Week 18 is summerweek.
-
-
-
-int monthIdx = 0;
-while ( t_h > hourOfYearPerMonth[monthIdx] ) {
-	monthIdx++;
-	if (monthIdx==hourOfYearPerMonth.length){
-		break;
-	}	
-}
-
-int dayOfMonth = 1+(int)((t_h - hourOfYearPerMonth[monthIdx])/24.0);
-traceln("Day of month start: %s", dayOfMonth);
-traceln("Month of year start: %s", monthIdx);
-startDate.setMonth(monthIdx);
-startDate.setDate(dayOfMonth);
-startDate.setHours(0);
-startDate.setMinutes(0);
-traceln("Startdate: %s", startDate);
-//startDate.set
-getExperiment().getEngine().setStartDate(startDate); 
 
 
-//traceln("Day of the week on january 1st %s: %s, int value: %s", p_year, DayOfWeek.from(localDate).name(), v_dayOfWeek1jan);
-
 // Initialize all agents in the correct order, creating all connections. What about setting initial values? And how about repeated simulations?
-
 f_buildGridNodeTree();
 c_gridConnections.forEach(GC -> GC.f_initialize());
 
@@ -1264,6 +1229,7 @@ Date f_getDate()
 
 double f_loopSimulation()
 {/*ALCODESTART::1758619562148*/
+v_liveSimLoopCount++;
 v_timeStepsElapsed = 0;
 f_clearAllLiveDatasets();
 traceln("The simulation has been looped.");
@@ -1377,3 +1343,38 @@ ArrayList<GridConnection> f_getAllGridConnections()
 c_assetManagement.remove(assetManagement);
 /*ALCODEEND*/}
 
+double f_initializeTimeDates()
+{/*ALCODESTART::1767178014622*/
+// Initialize time and date
+t_h = p_runStartTime_h;
+
+Date startDate = date();
+p_year = startDate.getYear() + 1900;
+
+LocalDate localDate = LocalDate.of(p_year, 1, 1);
+v_dayOfWeek1jan = DayOfWeek.from(localDate).getValue();
+p_startOfWinterWeek_h = roundToInt(24 * (p_winterWeekNumber * 7 + (8-v_dayOfWeek1jan)%7)); // Week 49 is winterweek.
+p_startOfSummerWeek_h = roundToInt(24 * (p_summerWeekNumber * 7 + (8-v_dayOfWeek1jan)%7)); // Week 18 is summerweek.
+
+int monthIdx = 0;
+while ( t_h > hourOfYearPerMonth[monthIdx] ) {
+	monthIdx++;
+	if (monthIdx==hourOfYearPerMonth.length){
+		break;
+	}	
+}
+
+int dayOfMonth = 1+(int)((t_h - hourOfYearPerMonth[monthIdx])/24.0);
+traceln("Day of month start: %s", dayOfMonth);
+traceln("Month of year start: %s", monthIdx);
+startDate.setMonth(monthIdx);
+startDate.setDate(dayOfMonth);
+startDate.setHours(0);
+startDate.setMinutes(0);
+traceln("Startdate: %s", startDate);
+//startDate.set
+getExperiment().getEngine().setStartDate(startDate); 
+
+
+/*ALCODEEND*/}
+
diff --git a/_alp/Agents/EnergyModel/Code/Functions.xml b/_alp/Agents/EnergyModel/Code/Functions.xml
index 4617ace..6b1da69 100644
--- a/_alp/Agents/EnergyModel/Code/Functions.xml
+++ b/_alp/Agents/EnergyModel/Code/Functions.xml
@@ -122,7 +122,7 @@
 		<Id>1671636439933</Id>
 		<Name><![CDATA[f_initializeForecasts]]></Name>
 		<X>730</X>
-		<Y>113</Y>
+		<Y>133</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -206,7 +206,7 @@
 		<Id>1716884712799</Id>
 		<Name><![CDATA[f_buildGridNodeTree]]></Name>
 		<X>730</X>
-		<Y>68</Y>
+		<Y>88</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -222,7 +222,7 @@
 		<Id>1716886716306</Id>
 		<Name><![CDATA[f_gridNodeRecursiveAdd]]></Name>
 		<X>750</X>
-		<Y>88</Y>
+		<Y>108</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -258,7 +258,7 @@
 		<Id>1716893898501</Id>
 		<Name><![CDATA[f_initializeEngine]]></Name>
 		<X>700</X>
-		<Y>48</Y>
+		<Y>68</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -355,7 +355,7 @@
 		<Name><![CDATA[f_initializePause]]></Name>
 		<Description><![CDATA[Function to initialize the paused gridconnections.]]></Description>
 		<X>730</X>
-		<Y>153</Y>
+		<Y>173</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -443,7 +443,7 @@
 		<Id>1731573713521</Id>
 		<Name><![CDATA[f_initializeLiveDataSets]]></Name>
 		<X>730</X>
-		<Y>133</Y>
+		<Y>153</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -802,4 +802,20 @@
 		</Parameter>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
+	<Function AccessType="public" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1767178014622</Id>
+		<Name><![CDATA[f_initializeTimeDates]]></Name>
+		<X>700</X>
+		<Y>50</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
 </Functions>
diff --git a/_alp/Agents/EnergyModel/Variables.xml b/_alp/Agents/EnergyModel/Variables.xml
index ca82027..1c7dba8 100644
--- a/_alp/Agents/EnergyModel/Variables.xml
+++ b/_alp/Agents/EnergyModel/Variables.xml
@@ -676,6 +676,7 @@
 	<Variable Class="PlainVariable">
 		<Id>1712842800772</Id>
 		<Name><![CDATA[v_dayOfWeek1jan]]></Name>
+		<Description><![CDATA[Index of day-of-week; 1 = Monday, 7 = Sunday]]></Description>
 		<X>-610</X>
 		<Y>130</Y>
 		<Label>
@@ -1485,6 +1486,28 @@
 			<Type><![CDATA[J_FlowsMap]]></Type>
 		</Properties>
 	</Variable>
+	<Variable Class="PlainVariable">
+		<Id>1767621890121</Id>
+		<Name><![CDATA[v_liveSimLoopCount]]></Name>
+		<X>1070</X>
+		<Y>430</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Properties SaveInSnapshot="true"
+              Constant="false"
+              AccessType="public"
+              StaticVariable="false">
+			<Type><![CDATA[int]]></Type>
+			<InitialValue Class="CodeValue">
+				<Code><![CDATA[0]]></Code>
+			</InitialValue>
+		</Properties>
+	</Variable>
 	<Variable Class="Parameter">
 		<Id>1658496701675</Id>
 		<Name><![CDATA[p_timeStep_h]]></Name>
diff --git a/_alp/Agents/GridConnection/Code/Functions.java b/_alp/Agents/GridConnection/Code/Functions.java
index 2f058bb..2c62839 100644
--- a/_alp/Agents/GridConnection/Code/Functions.java
+++ b/_alp/Agents/GridConnection/Code/Functions.java
@@ -280,8 +280,8 @@
 		
 		vehicle.tripTracker = tripTracker;	
 	}
-	else if( vehicle.getAvailability() && vehicle instanceof J_EAEV ev){
-		tripTracker.prepareNextActivity((energyModel.t_h-energyModel.p_runStartTime_h)*60, p_chargePoint);
+	else if( vehicle.getAvailability() && vehicle instanceof J_EAEV ev){ // J_EAEV that already has triptracker, but still needs to prepare next trip to determine chargedeadline.
+		tripTracker.prepareNextActivity(energyModel.t_h*60, p_chargePoint);
 	}
 	c_tripTrackers.add( tripTracker );
 	//v_vehicleIndex ++;
diff --git a/_alp/Classes/Class.J_ActivityTracker.java b/_alp/Classes/Class.J_ActivityTracker.java
index cd595eb..bb33b1a 100644
--- a/_alp/Classes/Class.J_ActivityTracker.java
+++ b/_alp/Classes/Class.J_ActivityTracker.java
@@ -16,7 +16,7 @@
 	    creatorVisibility = Visibility.NONE
 	)
 @JsonIdentityInfo(generator = ObjectIdGenerators.UUIDGenerator.class, property = "@id")
-public class J_ActivityTracker implements Serializable {
+public abstract class J_ActivityTracker implements Serializable {
 	protected EnergyModel energyModel;
 
 	// Tripdata
diff --git a/_alp/Classes/Class.J_ActivityTrackerCooking.java b/_alp/Classes/Class.J_ActivityTrackerCooking.java
index 866d21a..9029c27 100644
--- a/_alp/Classes/Class.J_ActivityTrackerCooking.java
+++ b/_alp/Classes/Class.J_ActivityTrackerCooking.java
@@ -55,15 +55,14 @@ public J_ActivityTrackerCooking(TextFile inputCookingActivities, int rowIndex, d
     	}
     	
     	while ( starttimes_min.get(v_eventIndex) - time_min < 0) {
-    		starttimes_min.set( v_eventIndex, starttimes_min.get(v_eventIndex) + 1440 );
-    		endtimes_min.set( v_eventIndex, endtimes_min.get(v_eventIndex) + 1440 );
+    		starttimes_min.set( v_eventIndex, starttimes_min.get(v_eventIndex) + 1440 );  // Source data is always just one day, repeating every day.
+    		endtimes_min.set( v_eventIndex, endtimes_min.get(v_eventIndex) + 1440 ); // Source data is always just one day, repeating every day.
     		v_eventIndex++;
     		if ( v_eventIndex > starttimes_min.size() - 1 ) {
     			v_eventIndex = 0;
     		}
     	}
     	
-    	
     	initalStarttimes_min = new ArrayList<>(starttimes_min);
     	initalEndtimes_min = new ArrayList<>(endtimes_min);
     	//traceln("Current model time in minutes: " + energyModel.t_h*60 + ", nb sessions: " + nbOfCookingSessions);
diff --git a/_alp/Classes/Class.J_ActivityTrackerTrips.java b/_alp/Classes/Class.J_ActivityTrackerTrips.java
index ec07ffa..15e0f6b 100644
--- a/_alp/Classes/Class.J_ActivityTrackerTrips.java
+++ b/_alp/Classes/Class.J_ActivityTrackerTrips.java
@@ -18,7 +18,7 @@ public class J_ActivityTrackerTrips extends J_ActivityTracker implements Seriali
 	public double v_nextEventStartTime_min;
 	public double distanceScaling_fr = 1.0;
 	public double currentTripTimesteps_n;
-	public String tripPatternIdentifier; 
+	//public String tripPatternIdentifier; 
 	
     /**
      * Default constructor
@@ -51,30 +51,22 @@ public J_ActivityTrackerTrips(EnergyModel main, TextFile tripsCsv, int rowIndex,
     		distances_km.add(tripsCsv.readDouble());
     	}
 
-	    // If trips have in inputdata have a 1-week schedule (endtime < 10080), then duplicate activities until the end of the year
-    	if (endtimes_min.get(nbActivities-1) < 10080) {
-		    for (int weeks = 1; weeks < 53; weeks++) {
-		    	for (int eventIdx = 0; eventIdx < nbActivities; eventIdx++) {
-		    		starttimes_min.add(starttimes_min.get(eventIdx) + 10080*weeks);
-		    		endtimes_min.add(endtimes_min.get(eventIdx) + 10080*weeks);
-		    		distances_km.add(distances_km.get(eventIdx));
-		    	}
-		    }
-	    }
-    	
-    	double currentAnnualDistance_km = distances_km.stream().mapToDouble(a -> a).sum();
-    	//traceln("Number of trips: %s, total annual distance: %s km", nbActivities, currentAnnualDistance_km);    	
-    	//traceln("Total annual distance: %s", currentAnnualDistance_km);
-	    // 'forward' to current activity if tripTracker is instantiated not at the start of the simulation or year
-	    while ( starttimes_min.get(v_eventIndex) < time_min ) {	
-	    	v_eventIndex++;
-	    	if ( v_eventIndex > starttimes_min.size() - 1 ) {	
-	    		break;
-	    	}
-	    }
-	    prepareNextActivity(time_min, chargePointRegistration);    	
-    }
+      	// 'forward' to next current activity
+       	setStartIndex(time_min/60.0, chargePointRegistration);    
+   }
    
+   private double getTimeSinceWeekStart(double time_min) {
+	   double timeSinceWeekStart_min = (time_min + (energyModel.v_dayOfWeek1jan-1) * 24 * 60) % (7*24*60); //  Trip start/end-times are all defined as minutes since monday 00:00h
+	   return timeSinceWeekStart_min;
+   }
+    
+   private void setNextTrip() {
+	   v_eventIndex++;
+	   if ( v_eventIndex > starttimes_min.size() - 1 ) {	
+	   		v_eventIndex = 0;
+	   }
+   }
+       
    public void setVehicle(J_EAVehicle Vehicle) {
 	   this.Vehicle = Vehicle;
    }
@@ -82,21 +74,13 @@ public void setVehicle(J_EAVehicle Vehicle) {
    public void setDistanceScaling_fr(double distanceScaling_fr) {
 	   this.distanceScaling_fr = distanceScaling_fr;
    }
-   
-   
+      
    public double getAnnualDistance_km() {
-	   double currentAnnualDistance_km = distances_km.stream().mapToDouble(a -> a).sum();
+	   double currentAnnualDistance_km = 52 * distances_km.stream().mapToDouble(a -> a).sum(); // assumed trip-data is one week long!! Hence the 52, for 52 weeks in a year.
 	   return currentAnnualDistance_km;
    }
+   
    public void setAnnualDistance_km(double desiredAnnualDistance_km) { // Scale trips to come to a certain total annual distance traveled. This can lead to unfeasibly long trips for EVs!!
-	   /* double currentAnnualDistance_km = 0;
-	   int tripNo=0;
-	   // Get current annual distance
-	   while (endtimes_min.get(tripNo) < 60*24*365) {
-		   currentAnnualDistance_km += distances_km.get(tripNo);
-		   tripNo++;
-	   }
-	   */
 	   double currentAnnualDistance_km = getAnnualDistance_km();
 	   double scalingFactor_f = desiredAnnualDistance_km / currentAnnualDistance_km;
 	   
@@ -113,9 +97,10 @@ public void setAnnualDistance_km(double desiredAnnualDistance_km) { // Scale tri
     
    public void manageActivities(double t_h, I_ChargePointRegistration chargePointRegistration) {
 		double time_min = t_h * 60;
+		double timeSinceWeekStart_min = getTimeSinceWeekStart(time_min); //  Trip start/end-times are all defined as minutes since monday 00:00h, trips are looped indefinitely
     	if (Vehicle.getAvailability()) { // at start of timestep! check for multiple 'events' in timestep!
     		//if (time_min == roundToInt(starttimes_min.get(v_eventIndex) / (60*energyModel.p_timeStep_h)) * (energyModel.p_timeStep_h * 60) ) { // is a trip starting this timestep?
-        	if ( time_min >= starttimes_min.get(v_eventIndex) ) { // is a trip starting this timestep?
+        	if ( timeSinceWeekStart_min >= starttimes_min.get(v_eventIndex) && (timeSinceWeekStart_min-energyModel.p_timeStep_h * 60) < starttimes_min.get(v_eventIndex)) { // is a trip starting this timestep?
     			//currentTripDuration = roundToInt(endtimes_min.get(v_eventIndex) - starttimes_min.get(v_eventIndex) / (energyModel.p_timeStep_h * 60));
     			currentTripTimesteps_n = max(1,roundToInt(((endtimes_min.get(v_eventIndex) - starttimes_min.get(v_eventIndex)) / (energyModel.p_timeStep_h * 60))));
     			
@@ -124,9 +109,9 @@ public void manageActivities(double t_h, I_ChargePointRegistration chargePointRe
     				chargePointRegistration.deregisterChargingRequest(EV);
     			}
         		//if (time_min == roundToInt(endtimes_min.get(v_eventIndex) / (60*energyModel.p_timeStep_h)) * (energyModel.p_timeStep_h*60) ) { // is the trip also ending this timestep?
-            	if (time_min >= endtimes_min.get(v_eventIndex) ) { // is the trip also ending this timestep?
+            	if (timeSinceWeekStart_min >= endtimes_min.get(v_eventIndex) && (timeSinceWeekStart_min-energyModel.p_timeStep_h * 60) < endtimes_min.get(v_eventIndex)) { // is the trip also ending this timestep?
         			Vehicle.endTrip(v_tripDist_km);
-        			v_eventIndex++;
+        			setNextTrip();//v_eventIndex++;
         			prepareNextActivity(time_min, chargePointRegistration);
         		}
     		}
@@ -140,12 +125,12 @@ else if (Vehicle instanceof J_EAHydrogenVehicle) {
     			hydrogenVehicle.progressTrip(v_tripDist_km / currentTripTimesteps_n);
     		}
     		//if (time_min == roundToInt(endtimes_min.get(v_eventIndex)/ (60*energyModel.p_timeStep_h)) * 60*energyModel.p_timeStep_h ) { // is a trip ending this timestep?
-        	if (time_min >= endtimes_min.get(v_eventIndex) ) { // is a trip ending this timestep?
+        	if (timeSinceWeekStart_min >= endtimes_min.get(v_eventIndex) && (timeSinceWeekStart_min-energyModel.p_timeStep_h * 60) < endtimes_min.get(v_eventIndex)) { // is a trip ending this timestep?
     			Vehicle.endTrip(v_tripDist_km);
-    			v_eventIndex++;
+    			setNextTrip();//v_eventIndex++;
     			prepareNextActivity(time_min, chargePointRegistration);
         		//if (time_min == roundToInt(starttimes_min.get(v_eventIndex) / (60*energyModel.p_timeStep_h)) * (energyModel.p_timeStep_h*60) ) { // is the next trip also starting this timestep?
-            	if (time_min >= starttimes_min.get(v_eventIndex) ) { // is the next trip also starting this timestep?
+            	if (timeSinceWeekStart_min >= starttimes_min.get(v_eventIndex) && (timeSinceWeekStart_min-energyModel.p_timeStep_h * 60) < starttimes_min.get(v_eventIndex) ) { // is the next trip also starting this timestep?
         			currentTripTimesteps_n = max(1,roundToInt(((endtimes_min.get(v_eventIndex) - starttimes_min.get(v_eventIndex)) / (energyModel.p_timeStep_h * 60))));
         			Vehicle.startTrip();
         			if(Vehicle instanceof J_EAEV EV) {
@@ -160,22 +145,32 @@ else if (Vehicle instanceof J_EAHydrogenVehicle) {
    	public void setStartIndex(double t_h, I_ChargePointRegistration chargePointRegistration) {
    		// 'forward' to current activity if tripTracker is instantiated not at the start of the simulation or year
    		double time_min = t_h * 60.0;
-	    while ( starttimes_min.get(v_eventIndex) < time_min ) {	
-	    	v_eventIndex++;
-	    	if ( v_eventIndex > starttimes_min.size() - 1 ) {	
-	    		break;
+   		
+   		double timeSinceWeekStart_min = getTimeSinceWeekStart(time_min);
+    	boolean looped = false;
+	    while ( starttimes_min.get(v_eventIndex) < (timeSinceWeekStart_min ) ) {	
+	    	setNextTrip(); // Skip to the next trip.
+
+	    	if (v_eventIndex == starttimes_min.size()-1 ) { 
+	    		if (looped) { // break while loop!
+	    			setNextTrip(); // Reverts to first trip of week
+	    			break;
+	    		} else {
+	    			looped = true;
+	    		}
 	    	}
+	    	
 	    }
 	    prepareNextActivity(time_min, chargePointRegistration);    	
    	}
     
     public void prepareNextActivity(double time_min, I_ChargePointRegistration chargePointRegistration) {
-		if ( v_eventIndex >= starttimes_min.size()  ) {
+		/*if ( v_eventIndex >= starttimes_min.size()  ) { // This should only happen at the end of the year, not every week.
 			v_eventIndex = 0;
-		}
-		
+		}*/
+       	double timeSinceWeekStart_min = getTimeSinceWeekStart(time_min);
 	    v_nextEventStartTime_min = starttimes_min.get(v_eventIndex);
-		v_idleTimeToNextTrip_min = v_nextEventStartTime_min - time_min;
+		v_idleTimeToNextTrip_min = (v_nextEventStartTime_min - timeSinceWeekStart_min) % (24*7*60); // Modulo 24*7*60 needed because otherwise negative values can occur when trip starts 'next week'.
 		v_tripDist_km = distanceScaling_fr * distances_km.get( v_eventIndex ); // Update upcoming trip distance
 
 		if (Vehicle instanceof J_EAEV ev) {
diff --git a/_alp/Classes/Class.J_EAHydrogenVehicle.java b/_alp/Classes/Class.J_EAHydrogenVehicle.java
index 2fbb404..24be0e1 100644
--- a/_alp/Classes/Class.J_EAHydrogenVehicle.java
+++ b/_alp/Classes/Class.J_EAHydrogenVehicle.java
@@ -67,7 +67,7 @@ public boolean startTrip() {
     public boolean endTrip(double tripDist_km) {
 		
 		if(available) {
-			traceln("Trip not ended because EV never left!");
+			traceln("Trip not ended because vehicle never left!");
 			return false;
 		} else {
 	    	available = true;
diff --git a/_alp/Classes/Class.J_EAPetroleumFuelVehicle.java b/_alp/Classes/Class.J_EAPetroleumFuelVehicle.java
index 938ca73..fd9e5d9 100644
--- a/_alp/Classes/Class.J_EAPetroleumFuelVehicle.java
+++ b/_alp/Classes/Class.J_EAPetroleumFuelVehicle.java
@@ -73,7 +73,7 @@ public boolean startTrip() {
     public boolean endTrip(double tripDist_km) {
 		
 		if(available) {
-			traceln("Trip not ended because vehicle never left!, tripIdentifier = " + tripTracker.tripPatternIdentifier);
+			traceln("Trip not ended because vehicle never left!");
 			return false;
 		} else {
 	    	this.available = true;