diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/ShipmentInsertionCalculator.java b/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/ShipmentInsertionCalculator.java
index 897e198b..ea006bb5 100644
--- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/ShipmentInsertionCalculator.java
+++ b/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/ShipmentInsertionCalculator.java
@@ -121,22 +121,36 @@ final class ShipmentInsertionCalculator implements JobInsertionCostsCalculator{
 		TourActivity prevAct = start;
 		double prevActEndTime = newVehicleDepartureTime;
 		boolean pickupShipmentLoopBroken = false;
+
+		//loops
+		int i = 0;
+		boolean tourEnd = false;
 		//pickupShipmentLoop
 		List<TourActivity> activities = currentRoute.getTourActivities().getActivities();
-		for(int i=0;i<activities.size();i++){
-			ConstraintsStatus pickupShipmentConstraintStatus = hardActivityLevelConstraint.fulfilled(insertionContext, prevAct, pickupShipment, activities.get(i), prevActEndTime);
+
+//		for(int i=0;i<activities.size();i++){
+		while(!tourEnd){
+			TourActivity nextAct;
+			if(i < activities.size()){
+				nextAct = activities.get(i);
+			}
+			else{
+				nextAct = end;
+				tourEnd = true;
+			}
+			ConstraintsStatus pickupShipmentConstraintStatus = hardActivityLevelConstraint.fulfilled(insertionContext, prevAct, pickupShipment, nextAct, prevActEndTime);
 			if(pickupShipmentConstraintStatus.equals(ConstraintsStatus.NOT_FULFILLED)){
-				double nextActArrTime = prevActEndTime + transportCosts.getTransportTime(prevAct.getLocation(), activities.get(i).getLocation(), prevActEndTime, newDriver, newVehicle);
-				prevActEndTime = CalculationUtils.getActivityEndTime(nextActArrTime, activities.get(i));
-				prevAct = activities.get(i);
+				double nextActArrTime = prevActEndTime + transportCosts.getTransportTime(prevAct.getLocation(), nextAct.getLocation(), prevActEndTime, newDriver, newVehicle);
+				prevActEndTime = CalculationUtils.getActivityEndTime(nextActArrTime, nextAct);
+				prevAct = nextAct;
 				continue;
 			}
 			else if(pickupShipmentConstraintStatus.equals(ConstraintsStatus.NOT_FULFILLED_BREAK)){
 				pickupShipmentLoopBroken = true;
 				break;
 			}
-			double additionalPickupICosts = softActivityConstraint.getCosts(insertionContext, prevAct, pickupShipment, activities.get(i), prevActEndTime);
-			double pickupAIC = calculate(insertionContext,prevAct,pickupShipment,activities.get(i),prevActEndTime);
+			double additionalPickupICosts = softActivityConstraint.getCosts(insertionContext, prevAct, pickupShipment, nextAct, prevActEndTime);
+			double pickupAIC = calculate(insertionContext,prevAct,pickupShipment, nextAct,prevActEndTime);
 
 			TourActivity prevAct_deliveryLoop = pickupShipment;
 			double shipmentPickupArrTime = prevActEndTime + transportCosts.getTransportTime(prevAct.getLocation(), pickupShipment.getLocation(), prevActEndTime, newDriver, newVehicle);
@@ -149,12 +163,18 @@ final class ShipmentInsertionCalculator implements JobInsertionCostsCalculator{
 
             double prevActEndTime_deliveryLoop = shipmentPickupEndTime;
 			boolean deliverShipmentLoopBroken = false;
+
+			/*
+			--------------------------------
+			 */
 			//deliverShipmentLoop
+
 			for(int j=i;j<activities.size();j++){
-				ConstraintsStatus deliverShipmentConstraintStatus = hardActivityLevelConstraint.fulfilled(insertionContext, prevAct_deliveryLoop, deliverShipment, activities.get(j), prevActEndTime_deliveryLoop); 
+				TourActivity nextAct_deliveryLoop = activities.get(j);
+				ConstraintsStatus deliverShipmentConstraintStatus = hardActivityLevelConstraint.fulfilled(insertionContext, prevAct_deliveryLoop, deliverShipment, nextAct_deliveryLoop, prevActEndTime_deliveryLoop);
 				if(deliverShipmentConstraintStatus.equals(ConstraintsStatus.FULFILLED)){
-					double additionalDeliveryICosts = softActivityConstraint.getCosts(insertionContext, prevAct_deliveryLoop, deliverShipment, activities.get(j), prevActEndTime_deliveryLoop);
-					double deliveryAIC = calculate(insertionContext,prevAct_deliveryLoop,deliverShipment,activities.get(j),prevActEndTime_deliveryLoop);
+					double additionalDeliveryICosts = softActivityConstraint.getCosts(insertionContext, prevAct_deliveryLoop, deliverShipment, nextAct_deliveryLoop, prevActEndTime_deliveryLoop);
+					double deliveryAIC = calculate(insertionContext,prevAct_deliveryLoop,deliverShipment, nextAct_deliveryLoop,prevActEndTime_deliveryLoop);
 					double totalActivityInsertionCosts = pickupAIC + deliveryAIC
 							+ additionalICostsAtRouteLevel + additionalPickupICosts + additionalDeliveryICosts;
 					if(totalActivityInsertionCosts < bestCost){
@@ -168,10 +188,13 @@ final class ShipmentInsertionCalculator implements JobInsertionCostsCalculator{
 					break;
 				}	
 				//update prevAct and endTime
-				double nextActArrTime = prevActEndTime_deliveryLoop + transportCosts.getTransportTime(prevAct_deliveryLoop.getLocation(), activities.get(j).getLocation(), prevActEndTime_deliveryLoop, newDriver, newVehicle);
-				prevActEndTime_deliveryLoop = CalculationUtils.getActivityEndTime(nextActArrTime, activities.get(j));
-				prevAct_deliveryLoop = activities.get(j);
+				double nextActArrTime = prevActEndTime_deliveryLoop + transportCosts.getTransportTime(prevAct_deliveryLoop.getLocation(), nextAct_deliveryLoop.getLocation(), prevActEndTime_deliveryLoop, newDriver, newVehicle);
+				prevActEndTime_deliveryLoop = CalculationUtils.getActivityEndTime(nextActArrTime, nextAct_deliveryLoop);
+				prevAct_deliveryLoop = nextAct_deliveryLoop;
 			}
+			/*
+			--------------------------------
+			 */
 			if(!deliverShipmentLoopBroken){ //check insertion between lastAct and endOfTour
 				ConstraintsStatus deliverShipmentConstraintStatus = hardActivityLevelConstraint.fulfilled(insertionContext, prevAct_deliveryLoop, deliverShipment, end, prevActEndTime_deliveryLoop);
 				if(deliverShipmentConstraintStatus.equals(ConstraintsStatus.FULFILLED)){
@@ -187,39 +210,40 @@ final class ShipmentInsertionCalculator implements JobInsertionCostsCalculator{
 				}
 			}
 			//update prevAct and endTime
-			double nextActArrTime = prevActEndTime + transportCosts.getTransportTime(prevAct.getLocation(), activities.get(i).getLocation(), prevActEndTime, newDriver, newVehicle);
-			prevActEndTime = CalculationUtils.getActivityEndTime(nextActArrTime, activities.get(i));
-			prevAct = activities.get(i);
-		}
-		if(!pickupShipmentLoopBroken){ //check insertion of pickupShipment and deliverShipment at just before tour ended
-			ConstraintsStatus pickupShipmentConstraintStatus = hardActivityLevelConstraint.fulfilled(insertionContext, prevAct, pickupShipment, end, prevActEndTime);
-			if(pickupShipmentConstraintStatus.equals(ConstraintsStatus.FULFILLED)){
-				double additionalPickupICosts = softActivityConstraint.getCosts(insertionContext, prevAct, pickupShipment, end, prevActEndTime);
-				double pickupAIC = calculate(insertionContext,prevAct,pickupShipment,end,prevActEndTime);
-				TourActivity prevAct_deliveryLoop = pickupShipment;
-				double shipmentPickupArrTime = prevActEndTime + transportCosts.getTransportTime(prevAct.getLocation(), pickupShipment.getLocation(), prevActEndTime, newDriver, newVehicle);
-				double shipmentPickupEndTime = CalculationUtils.getActivityEndTime(shipmentPickupArrTime, pickupShipment);
-				double prevActEndTime_deliveryLoop = shipmentPickupEndTime;
-
-                pickupContext.setArrivalTime(shipmentPickupArrTime);
-                pickupContext.setEndTime(shipmentPickupEndTime);
-                pickupContext.setInsertionIndex(activities.size());
-                insertionContext.setRelatedActivityContext(pickupContext);
-
-                ConstraintsStatus deliverShipmentConstraintStatus = hardActivityLevelConstraint.fulfilled(insertionContext, prevAct_deliveryLoop, deliverShipment, end, prevActEndTime_deliveryLoop);
-				if(deliverShipmentConstraintStatus.equals(ConstraintsStatus.FULFILLED)){
-					double additionalDeliveryICosts = softActivityConstraint.getCosts(insertionContext, prevAct_deliveryLoop, deliverShipment, end, prevActEndTime_deliveryLoop);
-					double deliveryAIC = calculate(insertionContext,prevAct_deliveryLoop,deliverShipment,end,prevActEndTime_deliveryLoop);
-					double totalActivityInsertionCosts = pickupAIC + deliveryAIC
-							+ additionalICostsAtRouteLevel + additionalPickupICosts + additionalDeliveryICosts;
-					if(totalActivityInsertionCosts < bestCost){
-						bestCost = totalActivityInsertionCosts;
-						pickupInsertionIndex = activities.size();
-						deliveryInsertionIndex = activities.size();
-					}
-				}
-			}
+			double nextActArrTime = prevActEndTime + transportCosts.getTransportTime(prevAct.getLocation(), nextAct.getLocation(), prevActEndTime, newDriver, newVehicle);
+			prevActEndTime = CalculationUtils.getActivityEndTime(nextActArrTime, nextAct);
+			prevAct = nextAct;
+			i++;
 		}
+//		if(!pickupShipmentLoopBroken){ //check insertion of pickupShipment and deliverShipment at just before tour ended
+//			ConstraintsStatus pickupShipmentConstraintStatus = hardActivityLevelConstraint.fulfilled(insertionContext, prevAct, pickupShipment, end, prevActEndTime);
+//			if(pickupShipmentConstraintStatus.equals(ConstraintsStatus.FULFILLED)){
+//				double additionalPickupICosts = softActivityConstraint.getCosts(insertionContext, prevAct, pickupShipment, end, prevActEndTime);
+//				double pickupAIC = calculate(insertionContext,prevAct,pickupShipment,end,prevActEndTime);
+//				TourActivity prevAct_deliveryLoop = pickupShipment;
+//				double shipmentPickupArrTime = prevActEndTime + transportCosts.getTransportTime(prevAct.getLocation(), pickupShipment.getLocation(), prevActEndTime, newDriver, newVehicle);
+//				double shipmentPickupEndTime = CalculationUtils.getActivityEndTime(shipmentPickupArrTime, pickupShipment);
+//				double prevActEndTime_deliveryLoop = shipmentPickupEndTime;
+//
+//                pickupContext.setArrivalTime(shipmentPickupArrTime);
+//                pickupContext.setEndTime(shipmentPickupEndTime);
+//                pickupContext.setInsertionIndex(activities.size());
+//                insertionContext.setRelatedActivityContext(pickupContext);
+//
+//                ConstraintsStatus deliverShipmentConstraintStatus = hardActivityLevelConstraint.fulfilled(insertionContext, prevAct_deliveryLoop, deliverShipment, end, prevActEndTime_deliveryLoop);
+//				if(deliverShipmentConstraintStatus.equals(ConstraintsStatus.FULFILLED)){
+//					double additionalDeliveryICosts = softActivityConstraint.getCosts(insertionContext, prevAct_deliveryLoop, deliverShipment, end, prevActEndTime_deliveryLoop);
+//					double deliveryAIC = calculate(insertionContext,prevAct_deliveryLoop,deliverShipment,end,prevActEndTime_deliveryLoop);
+//					double totalActivityInsertionCosts = pickupAIC + deliveryAIC
+//							+ additionalICostsAtRouteLevel + additionalPickupICosts + additionalDeliveryICosts;
+//					if(totalActivityInsertionCosts < bestCost){
+//						bestCost = totalActivityInsertionCosts;
+//						pickupInsertionIndex = activities.size();
+//						deliveryInsertionIndex = activities.size();
+//					}
+//				}
+//			}
+//		}
 		if(pickupInsertionIndex == InsertionData.NO_INDEX) {
 			return InsertionData.createEmptyInsertionData();
 		}