diff --git a/test/regress/final_tours.csv b/test/regress/final_tours.csv
index 6b74ff7..2994951 100644
--- a/test/regress/final_tours.csv
+++ b/test/regress/final_tours.csv
@@ -14,7 +14,7 @@
 2104424,"work",1,1,1,1,"mandatory",1,1625,204,786980,18,37,19,,,,699,,,false,true,,"Pickup_20_Gas","Pickup_20_Gas","Pickup_20_Gas","SHARED2",-1.5232409870320345,"Pickup_20_Gas","no_subtours",,"0out_0in","work",105221248
 2104425,"eatout",1,1,2,2,"non_mandatory",1,3243,204,786980,28,29,1,,,,946,,,false,true,15.688277880542076,"Pickup_20_Gas","Pickup_20_Gas","Pickup_20_Gas","WALK",1.350742492895049,,"",,"0out_0in","eatout",105221256
 2104425,"work",1,1,1,2,"mandatory",1,8578,204,786980,10,28,18,,,,414,,,false,true,,"Pickup_20_Gas","Pickup_20_Gas","Pickup_20_Gas","SHARED2",-1.244066284770072,"Pickup_20_Gas","no_subtours",,"0out_0in","work",105221298
-2104426,"eat",1,1,1,1,"atwork",1,1770,5503,786980,23,23,0,,,,825,,,,,8.93150395803886,,,,"SHARED2",0.35017038799905037,"Pickup_20_Gas","",105221348,"0out_0in","atwork",105221304
+2104426,"eat",1,1,1,1,"atwork",1,1770,5503,786980,23,23,0,,,,825,,,,,8.931504276867201,,,,"SHARED2",0.35017038799905037,"Pickup_20_Gas","",105221348,"0out_0in","atwork",105221304
 2104426,"work",1,1,1,1,"mandatory",1,5503,204,786980,11,39,28,,,,463,,,false,true,,"Pickup_20_Gas","Pickup_20_Gas","Pickup_20_Gas","DRIVEALONE",-0.25885942648703625,"Pickup_20_Gas","eat",,"0out_0in","work",105221348
 2106557,"eatout",1,1,2,2,"non_mandatory",1,288,288,788147,13,14,1,,,,511,,,false,true,16.54002132157871,"Car_12_Gas","Car_12_Gas","Car_12_Gas","WALK",1.6215709530445697,,"",,"0out_0in","eatout",105327856
 2106557,"shopping",1,1,1,2,"non_mandatory",1,6726,288,788147,19,24,5,,,,716,,,false,true,10.050914316024395,"Car_12_Gas","Car_12_Gas","Car_12_Gas","DRIVEALONE",-0.24799593418886876,"Car_12_Gas","",,"0out_1in","shopping",105327891
@@ -48,7 +48,7 @@
 2123028,"eat",1,1,1,1,"atwork",1,2064,6611,797317,32,32,0,,,,1023,,,,,9.537086811974508,,,,"WALK",3.2255946344141093,"non_hh_veh","",106151449,"0out_0in","atwork",106151405
 2123028,"work",2,1,1,2,"mandatory",1,6611,1056,797317,8,31,23,,,,338,,,false,true,,"non_hh_veh","non_hh_veh","non_hh_veh","WALK",1.8535862313537952,,"no_subtours",,"0out_0in","work",106151448
 2123028,"work",2,2,2,2,"mandatory",1,6611,1056,797317,32,43,11,,,,1034,,,false,true,,"non_hh_veh","non_hh_veh","non_hh_veh","SHARED2",1.8693174948439983,"non_hh_veh","eat",,"0out_0in","work",106151449
-2123609,"eat",1,1,1,1,"atwork",1,3341,263,797657,35,37,2,,,,1073,,,,,10.095392200881532,,,,"WALK",3.1131993610710085,,"",106180498,"0out_0in","atwork",106180454
+2123609,"eat",1,1,1,1,"atwork",1,3341,263,797657,35,37,2,,,,1073,,,,,10.09539220088153,,,,"WALK",3.1131993610710085,,"",106180498,"0out_0in","atwork",106180454
 2123609,"othdiscr",1,1,2,2,"non_mandatory",1,1062,1062,797657,21,29,8,,,,778,,,false,true,22.325720208842665,"non_hh_veh","non_hh_veh","non_hh_veh","WALK",4.36601062297162,,"",,"0out_0in","othdiscr",106180475
 2123609,"work",1,1,1,2,"mandatory",1,263,1062,797657,30,46,16,,,,1002,,,false,true,,"non_hh_veh","non_hh_veh","non_hh_veh","WALK",1.3365349840569545,,"eat",,"0out_0in","work",106180498
 2126311,"social",1,1,1,1,"joint",2,493,1215,799176,30,33,3,,,,989,1,"adults",false,true,16.74240705978637,"non_hh_veh","non_hh_veh","non_hh_veh","SHARED2",-1.665285309902433,"non_hh_veh","",,"0out_0in","social",106315571
@@ -61,13 +61,13 @@
 2136799,"othmaint",1,1,2,2,"non_mandatory",1,2705,1577,805047,13,21,8,,,,518,,,false,true,12.918569793797893,"Car_13_Gas","Car_13_Gas","Car_10_Gas","WALK",1.06504941074593,,"",,"3out_3in","othmaint",106839979
 2136799,"work",1,1,1,2,"mandatory",1,10641,1577,805047,7,12,5,,,,278,,,false,true,,"Car_13_Gas","Car_13_Gas","Car_10_Gas","BIKE",-2.2852492052970517,,"no_subtours",,"0out_0in","work",106839998
 2141996,"othmaint",1,1,1,1,"non_mandatory",1,1437,1753,807979,15,16,1,,,,582,,,false,true,13.007371902703355,"Car_7_Gas","Car_7_Gas","Car_7_Gas","WALK",0.36910502875835044,,"",,"0out_0in","othmaint",107099829
-2141997,"eat",1,1,1,1,"atwork",1,131,3531,807979,18,20,2,,,,682,,,,,7.411879247212876,,,,"SHARED3",-3.1017202520633345,"non_hh_veh","",107099898,"0out_1in","atwork",107099854
+2141997,"eat",1,1,1,1,"atwork",1,131,3531,807979,18,20,2,,,,682,,,,,7.411879011831174,,,,"SHARED3",-3.1017202520633345,"non_hh_veh","",107099898,"0out_1in","atwork",107099854
 2141997,"work",1,1,1,1,"mandatory",1,3531,1753,807979,12,30,18,,,,491,,,false,true,,"Car_7_Gas","Car_7_Gas","Car_7_Gas","WALK",-0.5877416208609617,,"eat",,"2out_3in","work",107099898
 2142915,"shopping",1,1,1,1,"non_mandatory",1,3470,1793,808447,30,32,2,,,,988,,,false,true,10.86282090390943,"Car_14_Gas","Car_14_Gas","Car_14_Gas","DRIVEALONE",0.43288254884086635,"Car_14_Gas","",,"0out_0in","shopping",107145791
 2149430,"othdiscr",3,1,1,3,"joint",2,1965,1965,812300,28,30,2,,,,947,7,"adults",false,true,21.2855864143359,"Pickup_10_Gas","Pickup_10_Gas","Pickup_10_Gas","SHARED2",0.028921723388796932,"Pickup_10_Gas","",,"0out_0in","othdiscr",107471515
 2149430,"othdiscr",3,2,2,3,"joint",2,1185,1965,812300,32,34,2,,,,1025,8,"adults",false,true,20.694852614283487,"Pickup_10_Gas","Pickup_10_Gas","Pickup_10_Gas","SHARED2",0.09971683558030454,"Pickup_10_Gas","",,"0out_0in","othdiscr",107471516
 2149430,"othdiscr",3,3,3,3,"non_mandatory",1,7449,1965,812300,21,22,1,,,,771,,,false,true,21.8448081468504,"Pickup_10_Gas","Pickup_10_Gas","Pickup_10_Gas","WALK",2.133862334264275,,"",,"0out_0in","othdiscr",107471525
-2156934,"business",1,1,1,1,"atwork",1,7047,2918,816340,7,15,8,,,,281,,,,,7.044801964874713,,,,"WALK",-0.7070650488778034,"Car_11_Gas","",107846748,"1out_1in","atwork",107846700
+2156934,"business",1,1,1,1,"atwork",1,7047,2918,816340,7,15,8,,,,281,,,,,7.0448019310945815,,,,"WALK",-0.7070650488778034,"Car_11_Gas","",107846748,"1out_1in","atwork",107846700
 2156934,"work",2,1,1,2,"mandatory",1,2918,2252,816340,7,15,8,,,,281,,,false,true,,"Car_11_Gas","Car_11_Gas","Car_11_Gas","DRIVEALONE",-0.3891434431103296,"Car_11_Gas","business1",,"0out_0in","work",107846748
 2156934,"work",2,2,2,2,"mandatory",1,2918,2252,816340,21,26,5,,,,775,,,false,true,,"Car_11_Gas","Car_11_Gas","Car_11_Gas","DRIVEALONE",-0.38891675037730533,"Car_11_Gas","no_subtours",,"0out_0in","work",107846749
 2157387,"othdiscr",1,1,1,1,"non_mandatory",1,2280,2280,816592,11,15,4,,,,439,,,false,true,19.394438772023722,"Pickup_7_Gas","Pickup_7_Gas","Pickup_7_Gas","WALK",2.5347464883952164,,"",,"0out_2in","othdiscr",107869375
@@ -77,13 +77,13 @@
 2163877,"shopping",1,1,1,1,"non_mandatory",1,1874,2538,820094,22,24,2,,,,800,,,false,true,11.643257399436326,"Car_12_Gas","Car_12_Gas","Car_12_Gas","WALK",1.2168789200871328,,"",,"0out_0in","shopping",108193891
 2168938,"shopping",1,1,1,1,"non_mandatory",1,2728,2728,822459,18,21,3,,,,683,,,false,true,13.155938906607526,"SUV_7_Gas","SUV_7_Gas","SUV_7_Gas","BIKE",2.366804116779882,,"",,"1out_0in","shopping",108446941
 2170053,"escort",1,1,2,4,"non_mandatory",1,1293,2761,823163,6,6,0,,,,230,,,false,true,13.892932286506912,"Car_8_Gas","Car_8_Gas","Car_8_Gas","DRIVEALONE",0.033383554960923045,"Car_8_Gas","",,"3out_3in","escort",108502659
-2170053,"maint",1,1,1,1,"atwork",1,131,3699,823163,18,20,2,,,,682,,,,,5.565915719980252,,,,"SHARED3",-5.477994229677344,"Car_8_Gas","",108502698,"0out_1in","atwork",108502673
+2170053,"maint",1,1,1,1,"atwork",1,131,3699,823163,18,20,2,,,,682,,,,,5.565924692237235,,,,"SHARED3",-5.477994229677344,"Car_8_Gas","",108502698,"0out_1in","atwork",108502673
 2170053,"othdiscr",1,1,4,4,"non_mandatory",1,7687,2761,823163,30,31,1,,,,987,,,false,true,15.448538516529151,"Car_8_Gas","Car_8_Gas","Car_8_Gas","SHARED3",1.8131829130544421,"Car_8_Gas","",,"1out_0in","othdiscr",108502675
 2170053,"othmaint",1,1,3,4,"non_mandatory",1,10643,2761,823163,36,37,1,,,,1086,,,false,true,11.638679240618274,"Car_8_Gas","Car_8_Gas","Car_8_Gas","WALK_LOC",-2.7262666405037455,,"",,"3out_3in","othmaint",108502679
 2170053,"work",1,1,1,4,"mandatory",1,3699,2761,823163,11,28,17,,,,452,,,false,true,,"Car_8_Gas","Car_8_Gas","Car_8_Gas","DRIVEALONE",-1.4512608365070685,"Car_8_Gas","maint",,"0out_0in","work",108502698
 2170057,"escort",1,1,1,2,"non_mandatory",1,3640,2761,823163,24,26,2,,,,853,,,false,true,13.102143509750242,"Car_8_Gas","Car_8_Gas","Car_8_Gas","SHARED3",1.0499759276760054,"Car_8_Gas","",,"0out_0in","escort",108502859
 2170057,"othmaint",1,1,2,2,"non_mandatory",1,1627,2761,823163,16,24,8,,,,623,,,false,true,12.052557736739624,"Car_8_Gas","Car_8_Gas","Car_8_Gas","WALK",1.8321593179164521,,"",,"0out_0in","othmaint",108502879
-2170725,"eat",1,1,1,1,"atwork",1,2787,2547,823520,23,25,2,,,,827,,,,,9.861579491707847,,,,"WALK",0.7699985821733352,"Car_20_Gas","",108536298,"0out_0in","atwork",108536254
+2170725,"eat",1,1,1,1,"atwork",1,2787,2547,823520,23,25,2,,,,827,,,,,9.86157949189224,,,,"WALK",0.7699985821733352,"Car_20_Gas","",108536298,"0out_0in","atwork",108536254
 2170725,"work",1,1,1,1,"mandatory",1,2547,2768,823520,11,29,18,,,,453,,,false,true,,"Car_20_Gas","Car_4_Gas","Car_4_Gas","DRIVEALONE",-1.581586398235528,"Car_20_Gas","eat",,"0out_1in","work",108536298
 2171597,"eatout",1,1,1,1,"non_mandatory",1,551,2784,824076,16,17,1,,,,616,,,false,true,18.086249789887432,"SUV_5_Gas","SUV_5_Gas","SUV_5_Gas","WALK",2.1257572819746584,,"",,"0out_0in","eatout",108579856
 2172024,"othdiscr",1,1,1,1,"non_mandatory",1,2104,2794,824360,12,16,4,,,,477,,,false,true,16.517119719650903,"SUV_5_Gas","SUV_5_Gas","Pickup_4_Gas","WALK",1.8734694496952913,,"",,"0out_1in","othdiscr",108601225
@@ -92,7 +92,7 @@
 2173608,"eatout",1,1,1,1,"non_mandatory",1,1812,2834,825301,35,40,5,,,,1076,,,false,true,19.905753590595577,"Car_12_Gas","Car_12_Gas","Car_12_Gas","WALK",2.8710291113375805,,"",,"0out_0in","eatout",108680406
 2182271,"shopping",1,1,1,2,"joint",2,6726,3198,830248,19,28,9,,,,720,15,"adults",false,true,11.7583436916589,"Car_15_Gas","Van_9_Gas","Van_9_Gas","SHARED2",-1.770236858958809,"Van_9_Gas","",,"0out_1in","shopping",109113569
 2182271,"othdiscr",1,1,2,2,"non_mandatory",1,430,3198,830248,10,14,4,,,,400,,,false,true,15.970448632892134,"Van_9_Gas","Car_15_Gas","Van_9_Gas","WALK",1.3236630410143455,,"",,"0out_0in","othdiscr",109113575
-2183105,"eat",1,1,1,1,"atwork",1,3410,3410,830642,16,18,2,,,,617,,,,,11.208611439857902,,,,"DRIVEALONE",0.9396177497964784,"Car_5_Gas","",109155298,"1out_0in","atwork",109155254
+2183105,"eat",1,1,1,1,"atwork",1,3410,3410,830642,16,18,2,,,,617,,,,,11.208611367020447,,,,"DRIVEALONE",0.9396177497964784,"Car_5_Gas","",109155298,"1out_0in","atwork",109155254
 2183105,"work",1,1,1,1,"mandatory",1,3410,3243,830642,11,34,23,,,,458,,,false,true,,"Car_5_Gas","Car_5_Gas","Car_2_Gas","DRIVEALONE",-3.9121524405891277,"Car_5_Gas","eat",,"0out_0in","work",109155298
 2183106,"othdiscr",1,1,2,2,"non_mandatory",1,6625,3243,830642,18,22,4,,,,684,,,false,true,15.56761267261178,"Car_5_Gas","Car_5_Gas","Car_5_Gas","WALK",1.5414512744625302,,"",,"0out_0in","othdiscr",109155325
 2183106,"shopping",1,1,1,2,"non_mandatory",1,5779,3243,830642,14,15,1,,,,547,,,false,true,10.272346176974976,"Car_5_Gas","Car_2_Gas","Car_2_Gas","DRIVEALONE",-1.421848758534357,"Car_5_Gas","",,"0out_0in","shopping",109155341
@@ -145,10 +145,10 @@
 2213405,"shopping",1,1,1,3,"non_mandatory",1,8388,5625,847266,31,36,5,,,,1010,,,false,true,10.353803692393942,"Car_3_Gas","Car_3_Gas","Car_3_Gas","WALK",-1.1706425015349835,,"",,"0out_0in","shopping",110670291
 2213534,"eat",1,1,1,1,"atwork",1,2547,3455,847360,19,21,2,,,,713,,,,,9.323574336664983,,,,"WALK",2.2126798972014883,,"",110676748,"0out_0in","atwork",110676704
 2213534,"work",1,1,1,1,"mandatory",1,3455,5625,847360,8,31,23,,,,338,,,false,true,,"non_hh_veh","non_hh_veh","non_hh_veh","WALK",2.375809221548131,,"eat",,"0out_1in","work",110676748
-2219704,"eat",1,1,1,1,"atwork",1,806,3752,850412,20,22,2,,,,743,,,,,4.594311052427109,,,,"WALK",-1.1546370093427032,"SUV_2_Gas","",110985248,"0out_0in","atwork",110985204
+2219704,"eat",1,1,1,1,"atwork",1,806,3752,850412,20,22,2,,,,743,,,,,4.594257061118674,,,,"WALK",-1.1546370093427032,"SUV_2_Gas","",110985248,"0out_0in","atwork",110985204
 2219704,"escort",1,1,2,2,"non_mandatory",1,11171,6196,850412,33,33,0,,"pure_escort",1,1040,,,false,true,,"Van_10_Gas","Van_10_Gas","Van_10_Gas","SHARED2",-1.625869139011125,"Van_10_Gas","",,"1out_0in","escort",110985235
 2219704,"work",1,1,1,2,"mandatory",1,3752,6196,850412,7,29,22,,,,295,,,false,true,,"SUV_2_Gas","SUV_2_Gas","SUV_2_Gas","SHARED3",-1.7668222998454381,"SUV_2_Gas","eat",,"0out_0in","work",110985248
-2219705,"eat",1,1,1,1,"atwork",1,8582,10653,850412,17,22,5,,,,653,,,,,7.121140637738541,,,,"WALK",-1.5848138867751722,"Van_10_Gas","",110985298,"0out_1in","atwork",110985254
+2219705,"eat",1,1,1,1,"atwork",1,8582,10653,850412,17,22,5,,,,653,,,,,7.121180810873566,,,,"WALK",-1.5848138867751722,"Van_10_Gas","",110985298,"0out_1in","atwork",110985254
 2219705,"othdiscr",1,1,2,2,"non_mandatory",1,6196,6196,850412,6,7,1,,,,231,,,false,true,13.742960668512648,"Van_10_Gas","Van_10_Gas","SUV_2_Gas","WALK",0.8191996605191169,,"",,"0out_0in","othdiscr",110985275
 2219705,"work",1,1,1,2,"mandatory",1,10653,6196,850412,7,30,23,,,,296,,,false,true,,"Van_10_Gas","Van_10_Gas","SUV_2_Gas","SHARED2",-1.7019248276773262,"Van_10_Gas","eat",,"1out_2in","work",110985298
 2219706,"school",1,1,1,1,"mandatory",1,11171,6196,850412,9,33,24,,"pure_escort",,380,,,false,true,,"SUV_2_Gas","SUV_2_Gas","Van_10_Gas","SHARED2",2.8959277921372046,"SUV_2_Gas","",,"1out_0in","school",110985333
@@ -158,14 +158,14 @@
 2222818,"shopping",1,1,1,1,"non_mandatory",1,1293,6625,852013,16,24,8,,,,623,,,false,true,10.010873339836383,"SUV_7_Diesel","SUV_7_Diesel","SUV_7_Diesel","DRIVEALONE",0.414985994132358,"SUV_7_Diesel","",,"1out_1in","shopping",111140941
 2234379,"social",1,1,1,1,"non_mandatory",1,795,7775,858401,8,19,11,,,,326,,,false,true,15.205912649692355,"non_hh_veh","non_hh_veh","non_hh_veh","WALK",1.7336195732695567,,"",,"0out_0in","social",111718995
 2236695,"othmaint",1,1,1,1,"non_mandatory",1,3640,8000,859711,27,28,1,,,,924,,,false,true,12.675662680658345,"Car_1_Gas","Car_2_Gas","Car_2_Gas","WALK",0.399206748251364,,"",,"0out_0in","othmaint",111834779
-2236696,"eat",1,1,1,1,"atwork",1,1342,2835,859711,19,22,3,,,,714,,,,,6.683395544467115,,,,"WALK",-2.248429569292359,"Car_2_Gas","",111834848,"0out_0in","atwork",111834804
+2236696,"eat",1,1,1,1,"atwork",1,1342,2835,859711,19,22,3,,,,714,,,,,6.6833506378394585,,,,"WALK",-2.248429569292359,"Car_2_Gas","",111834848,"0out_0in","atwork",111834804
 2236696,"work",1,1,1,1,"mandatory",1,2835,8000,859711,13,30,17,,,,527,,,false,true,,"Car_2_Gas","Car_1_Gas","Car_2_Gas","DRIVEALONE",-0.9565630784849029,"Car_2_Gas","eat",,"0out_0in","work",111834848
 2238297,"shopping",2,1,1,2,"joint",2,6726,8188,860567,20,23,3,,,,744,27,"adults",false,true,9.208517435908348,"Van_2_Gas","Van_2_Gas","Van_2_Gas","SHARED2",-1.9030301868912287,"Van_2_Gas","",,"0out_0in","shopping",111914869
 2238297,"shopping",2,2,2,2,"joint",2,24330,8188,860567,26,39,13,,,,913,28,"adults",false,true,1.7477485062800084,"Car_10_Gas","Car_10_Gas","Van_2_Gas","SHARED2",-8.3100940427395,"Car_10_Gas","",,"0out_1in","shopping",111914870
 2238298,"othdiscr",1,1,1,1,"non_mandatory",1,3160,8188,860567,9,14,5,,,,361,,,false,true,14.214156689740213,"Van_2_Gas","Van_2_Gas","Van_2_Gas","DRIVEALONE",0.43997603771212757,"Van_2_Gas","",,"0out_1in","othdiscr",111914925
 2239386,"work",1,1,1,1,"mandatory",1,1437,8267,861214,8,33,25,,,,340,,,false,true,,"non_hh_veh","non_hh_veh","non_hh_veh","TNC_SINGLE",-0.08321087092437507,,"no_subtours",,"0out_0in","work",111969348
 2240587,"social",1,1,1,1,"joint",2,3667,8470,861865,33,37,4,,,,1044,3,"adults",false,true,14.962302315391174,"Car_1_Gas","Car_8_Gas","Car_1_Gas","WALK",-1.6977007097665935,,"",,"0out_0in","social",112029371
-2240588,"eat",1,1,1,1,"atwork",1,11136,11137,861865,18,19,1,,,,681,,,,,6.343927991688457,,,,"SHARED2",0.38231870452788186,"Car_8_Gas","",112029448,"0out_0in","atwork",112029404
+2240588,"eat",1,1,1,1,"atwork",1,11136,11137,861865,18,19,1,,,,681,,,,,6.343984827692877,,,,"SHARED2",0.38231870452788186,"Car_8_Gas","",112029448,"0out_0in","atwork",112029404
 2240588,"work",1,1,1,1,"mandatory",1,11137,8470,861865,8,31,23,,,,338,,,false,true,,"Car_8_Gas","Car_1_Gas","Car_1_Gas","DRIVEALONE",-1.0978301155203356,"Car_8_Gas","eat",,"0out_0in","work",112029448
 2242136,"social",1,1,1,1,"non_mandatory",1,1606,8769,862635,32,36,4,,,,1027,,,false,true,15.891337950738896,"Car_15_Gas","Car_15_Gas","Car_15_Gas","WALK",2.81433831561607,,"",,"0out_0in","social",112106845
 2242922,"shopping",1,1,2,2,"joint",2,232,8861,863066,26,31,5,,,,905,17,"mixed",false,true,10.662351022919172,"SUV_2_Gas","SUV_2_Gas","SUV_2_Gas","SHARED2",-2.5228737083903128,"SUV_2_Gas","",,"0out_0in","shopping",112146119
@@ -183,10 +183,10 @@
 2248786,"work",1,1,1,1,"mandatory",1,2787,10629,866001,12,20,8,,,,481,,,false,true,,"Car_8_Gas","Car_8_Gas","Car_8_Gas","DRIVEALONE",-1.8285603800424797,"Car_8_Gas","no_subtours",,"0out_0in","work",112439348
 2252254,"othdiscr",1,1,1,1,"non_mandatory",1,7122,10675,868110,7,11,4,,,,277,,,false,true,13.576100565752704,"Car_19_Gas","Car_4_BEV","Car_4_BEV","SHARED3",-0.6651189513928082,"Car_4_BEV","",,"1out_0in","othdiscr",112612725
 2252304,"eatout",1,1,2,2,"joint",2,10675,10675,868143,34,34,0,,,,1056,23,"adults",false,true,15.238760279253649,"SUV_6_Gas","SUV_6_Gas","Car_1_Gas","SHARED2",-0.09026493858265011,"SUV_6_Gas","",,"0out_0in","eatout",112615213
-2252304,"maint",1,1,1,1,"atwork",1,10208,10208,868143,20,22,2,,,,743,,,,,10.459200881585724,,,,"DRIVEALONE",0.872294895934154,"SUV_6_Gas","",112615248,"0out_0in","atwork",112615223
+2252304,"maint",1,1,1,1,"atwork",1,10208,10208,868143,20,22,2,,,,743,,,,,10.45920087715465,,,,"DRIVEALONE",0.872294895934154,"SUV_6_Gas","",112615248,"0out_0in","atwork",112615223
 2252304,"work",1,1,1,2,"mandatory",1,10208,10675,868143,12,34,22,,,,495,,,false,true,,"SUV_6_Gas","SUV_6_Gas","Car_1_Gas","DRIVEALONE",-0.7803836944080456,"SUV_6_Gas","maint",,"0out_0in","work",112615248
 2252305,"othdiscr",1,1,1,1,"non_mandatory",1,10675,10675,868143,33,33,0,,,,1040,,,false,true,15.083865658633567,"Car_1_Gas","Car_1_Gas","Car_1_Gas","DRIVEALONE",1.0737062411790965,"Car_1_Gas","",,"0out_0in","othdiscr",112615275
-2252912,"eat",1,1,1,1,"atwork",1,8582,8941,868503,20,24,4,,,,745,,,,,6.5892743531293005,,,,"BIKE",-1.4403192548339128,"Pickup_9_Gas","",112645648,"0out_0in","atwork",112645604
+2252912,"eat",1,1,1,1,"atwork",1,8582,8941,868503,20,24,4,,,,745,,,,,6.589275351208942,,,,"BIKE",-1.4403192548339128,"Pickup_9_Gas","",112645648,"0out_0in","atwork",112645604
 2252912,"work",1,1,1,1,"mandatory",1,8941,10677,868503,9,36,27,,,,383,,,false,true,,"Pickup_9_Gas","Car_20_Gas","Car_3_Gas","DRIVEALONE",-1.3751360482385295,"Pickup_9_Gas","eat",,"0out_1in","work",112645648
 2252913,"work",2,1,1,2,"mandatory",1,1939,10677,868503,9,43,34,,,,390,,,false,true,,"Car_20_Gas","Car_20_Gas","Car_3_Gas","DRIVEALONE",-0.4076022030351331,"Car_20_Gas","no_subtours",,"1out_2in","work",112645698
 2252913,"work",2,2,2,2,"mandatory",1,1939,10677,868503,6,8,2,,,,232,,,false,true,,"Pickup_9_Gas","Pickup_9_Gas","Car_3_Gas","DRIVEALONE",-0.4231214797108996,"Pickup_9_Gas","no_subtours",,"0out_0in","work",112645699
@@ -203,7 +203,7 @@
 2259543,"othdiscr",1,1,1,1,"non_mandatory",1,11136,11137,871640,31,31,0,,,,1005,,,false,true,15.229456021278093,"non_hh_veh","non_hh_veh","non_hh_veh","WALK",2.9451993123064977,,"",,"0out_0in","othdiscr",112977175
 2260058,"shopping",1,1,1,1,"non_mandatory",1,5565,11145,871938,38,40,2,,,,1112,,,false,true,9.596030968876294,"Motorcycle_2_Gas","Motorcycle_2_Gas","Motorcycle_2_Gas","WALK",0.08654801385426904,,"",,"0out_0in","shopping",113002941
 2260254,"eatout",1,1,1,1,"non_mandatory",1,11145,11146,872062,23,25,2,,,,827,,,false,true,17.148196151869616,"non_hh_veh","non_hh_veh","non_hh_veh","WALK",2.2281392760006167,,"",,"0out_0in","eatout",113012706
-2260306,"eat",1,1,1,1,"atwork",1,806,3072,872090,19,21,2,,,,713,,,,,6.945549743758787,,,,"SHARED3",-0.4374045489431605,"non_hh_veh","",113015348,"0out_0in","atwork",113015304
+2260306,"eat",1,1,1,1,"atwork",1,806,3072,872090,19,21,2,,,,713,,,,,6.945543392063042,,,,"SHARED3",-0.4374045489431605,"non_hh_veh","",113015348,"0out_0in","atwork",113015304
 2260306,"work",1,1,1,1,"mandatory",1,3072,11147,872090,14,38,24,,,,570,,,false,true,,"Car_8_Gas","Car_8_Gas","Car_8_Gas","WALK",-0.09057536116359356,,"eat",,"0out_0in","work",113015348
 2260307,"othdiscr",1,1,1,1,"non_mandatory",1,2620,11147,872090,11,34,23,,,,458,,,false,true,14.31936193413297,"Car_8_Gas","Car_8_Gas","Car_8_Gas","DRIVEALONE",0.5067902240199875,"Car_8_Gas","",,"0out_1in","othdiscr",113015375
 2260358,"eatout",1,1,1,2,"non_mandatory",1,8267,11147,872123,20,21,1,,,,742,,,false,true,14.028678283530207,"SUV_9_Gas","SUV_9_Gas","SUV_9_Gas","WALK",-0.5948786350176833,,"",,"0out_0in","eatout",113017906
@@ -213,16 +213,16 @@
 2260636,"shopping",1,1,1,2,"non_mandatory",1,232,11150,872300,19,25,6,,,,717,,,false,true,13.098306382289842,"non_hh_veh","non_hh_veh","non_hh_veh","WALK",4.845872421480646,,"",,"0out_0in","shopping",113031841
 2261093,"othmaint",1,1,1,1,"non_mandatory",1,4300,11159,872550,13,28,15,,,,525,,,false,true,11.554811569920739,"SUV_13_Gas","SUV_10_Gas","SUV_10_Gas","SHARED2",-1.8755653006085253,"SUV_10_Gas","",,"0out_0in","othmaint",113054679
 2261094,"work",1,1,1,1,"mandatory",1,7026,11159,872550,12,32,20,,,,493,,,false,true,,"SUV_10_Gas","SUV_13_Gas","SUV_10_Gas","DRIVEALONE",-0.5914430354556978,"SUV_10_Gas","no_subtours",,"0out_0in","work",113054748
-2261095,"eat",1,1,1,1,"atwork",1,6339,9095,872550,14,16,2,,,,548,,,,,5.2757107245371575,,,,"DRIVEALONE",-5.8857116263276055,"SUV_10_Gas","",113054798,"0out_0in","atwork",113054754
+2261095,"eat",1,1,1,1,"atwork",1,6339,9095,872550,14,16,2,,,,548,,,,,5.2756860393788125,,,,"DRIVEALONE",-5.8857116263276055,"SUV_10_Gas","",113054798,"0out_0in","atwork",113054754
 2261095,"work",1,1,1,1,"mandatory",1,9095,11159,872550,13,37,24,,,,534,,,false,true,,"SUV_10_Gas","SUV_10_Gas","SUV_10_Gas","DRIVEALONE",-0.9034281643698449,"SUV_10_Gas","eat",,"1out_1in","work",113054798
 2261362,"escort",1,1,1,1,"non_mandatory",1,9066,11163,872713,29,29,0,,,,966,,,false,true,13.623006335221616,"Car_1_Gas","Car_1_Gas","Car_1_Gas","WALK",-0.014056390889937176,,"",,"0out_0in","escort",113068109
-2261550,"eat",1,1,1,1,"atwork",1,1770,10674,872821,19,21,2,,,,713,,,,,6.069088524359727,,,,"SHARED3",-0.7314559541974284,"non_hh_veh","",113077548,"0out_1in","atwork",113077504
+2261550,"eat",1,1,1,1,"atwork",1,1770,10674,872821,19,21,2,,,,713,,,,,6.069070103714911,,,,"SHARED3",-0.7314559541974284,"non_hh_veh","",113077548,"0out_1in","atwork",113077504
 2261550,"work",1,1,1,1,"mandatory",1,10674,11165,872821,10,28,18,,,,414,,,false,true,,"Car_9_Gas","Car_9_Gas","Car_10_Gas","WALK",-2.2741214336062363,,"eat",,"0out_0in","work",113077548
 2261552,"shopping",1,1,1,1,"non_mandatory",1,5565,11165,872821,20,23,3,,,,744,,,false,true,9.97011585398431,"Car_10_Gas","Car_9_Gas","Car_9_Gas","SHARED2",0.5054649933724233,"Car_9_Gas","",,"2out_3in","shopping",113077641
 2262297,"eatout",1,1,1,3,"joint",2,3602,11179,873254,33,34,1,,,,1041,13,"adults",false,true,12.76433995639308,"SUV_5_Gas","SUV_5_Gas","SUV_5_Gas","WALK",-0.9949080213979319,,"",,"1out_0in","eatout",113114863
 2262297,"othdiscr",2,1,2,3,"non_mandatory",1,1842,11179,873254,9,15,6,,,,362,,,false,true,12.342155149078545,"Van_20_Gas","SUV_5_Gas","SUV_5_Gas","WALK",0.36070459377529784,,"",,"0out_1in","othdiscr",113114875
 2262297,"othdiscr",2,2,3,3,"non_mandatory",1,11179,11179,873254,25,29,4,,,,880,,,false,true,13.143053815117767,"Van_20_Gas","SUV_5_Gas","SUV_5_Gas","DRIVEALONE",0.9813252019252375,"Van_20_Gas","",,"1out_0in","othdiscr",113114876
-2262298,"eat",1,1,1,1,"atwork",1,5565,10674,873254,18,22,4,,,,684,,,,,6.789795634631211,,,,"DRIVEALONE",-0.11849991875812071,"SUV_5_Gas","",113114948,"0out_0in","atwork",113114904
+2262298,"eat",1,1,1,1,"atwork",1,5565,10674,873254,18,22,4,,,,684,,,,,6.789794410151675,,,,"DRIVEALONE",-0.11849991875812071,"SUV_5_Gas","",113114948,"0out_0in","atwork",113114904
 2262298,"work",1,1,1,1,"mandatory",1,10674,11179,873254,12,30,18,,,,491,,,false,true,,"SUV_5_Gas","SUV_5_Gas","SUV_5_Gas","DRIVEALONE",-1.3649563648263758,"SUV_5_Gas","eat",,"2out_1in","work",113114948
 3238914,"othdiscr",1,1,2,2,"non_mandatory",1,1480,2,1233342,29,34,5,,,,971,,,false,true,22.76942033927221,"non_hh_veh","non_hh_veh","non_hh_veh","WALK",5.595280144226979,,"",,"0out_0in","othdiscr",161945725
 3238914,"school",1,1,1,2,"mandatory",1,2550,2,1233342,10,26,16,,,,412,,,false,true,,"non_hh_veh","non_hh_veh","non_hh_veh","SCH_BUS",35.021642580246336,,"",,"0out_0in","school",161945733
diff --git a/test/regress/reference-pipeline-hh100-recode.parquetpipeline/tours/atwork_subtour_destination.parquet b/test/regress/reference-pipeline-hh100-recode.parquetpipeline/tours/atwork_subtour_destination.parquet
index 6b64f13..c9d1187 100644
Binary files a/test/regress/reference-pipeline-hh100-recode.parquetpipeline/tours/atwork_subtour_destination.parquet and b/test/regress/reference-pipeline-hh100-recode.parquetpipeline/tours/atwork_subtour_destination.parquet differ
diff --git a/test/regress/reference-pipeline-hh100-recode.parquetpipeline/tours/atwork_subtour_mode_choice.parquet b/test/regress/reference-pipeline-hh100-recode.parquetpipeline/tours/atwork_subtour_mode_choice.parquet
index 4101953..3fe7c72 100644
Binary files a/test/regress/reference-pipeline-hh100-recode.parquetpipeline/tours/atwork_subtour_mode_choice.parquet and b/test/regress/reference-pipeline-hh100-recode.parquetpipeline/tours/atwork_subtour_mode_choice.parquet differ
diff --git a/test/regress/reference-pipeline-hh100-recode.parquetpipeline/tours/atwork_subtour_scheduling.parquet b/test/regress/reference-pipeline-hh100-recode.parquetpipeline/tours/atwork_subtour_scheduling.parquet
index 4cf5b87..79bc45b 100644
Binary files a/test/regress/reference-pipeline-hh100-recode.parquetpipeline/tours/atwork_subtour_scheduling.parquet and b/test/regress/reference-pipeline-hh100-recode.parquetpipeline/tours/atwork_subtour_scheduling.parquet differ
diff --git a/test/regress/reference-pipeline-hh100-recode.parquetpipeline/tours/stop_frequency.parquet b/test/regress/reference-pipeline-hh100-recode.parquetpipeline/tours/stop_frequency.parquet
index bb5ffa3..702e534 100644
Binary files a/test/regress/reference-pipeline-hh100-recode.parquetpipeline/tours/stop_frequency.parquet and b/test/regress/reference-pipeline-hh100-recode.parquetpipeline/tours/stop_frequency.parquet differ
diff --git a/test/regress/reference-pipeline-hh100.parquetpipeline/tours/atwork_subtour_destination.parquet b/test/regress/reference-pipeline-hh100.parquetpipeline/tours/atwork_subtour_destination.parquet
index bec7ced..6803f46 100644
Binary files a/test/regress/reference-pipeline-hh100.parquetpipeline/tours/atwork_subtour_destination.parquet and b/test/regress/reference-pipeline-hh100.parquetpipeline/tours/atwork_subtour_destination.parquet differ
diff --git a/test/regress/reference-pipeline-hh100.parquetpipeline/tours/atwork_subtour_mode_choice.parquet b/test/regress/reference-pipeline-hh100.parquetpipeline/tours/atwork_subtour_mode_choice.parquet
index 5240174..5d34144 100644
Binary files a/test/regress/reference-pipeline-hh100.parquetpipeline/tours/atwork_subtour_mode_choice.parquet and b/test/regress/reference-pipeline-hh100.parquetpipeline/tours/atwork_subtour_mode_choice.parquet differ
diff --git a/test/regress/reference-pipeline-hh100.parquetpipeline/tours/atwork_subtour_scheduling.parquet b/test/regress/reference-pipeline-hh100.parquetpipeline/tours/atwork_subtour_scheduling.parquet
index 1d22b33..85b17bd 100644
Binary files a/test/regress/reference-pipeline-hh100.parquetpipeline/tours/atwork_subtour_scheduling.parquet and b/test/regress/reference-pipeline-hh100.parquetpipeline/tours/atwork_subtour_scheduling.parquet differ
diff --git a/test/regress/reference-pipeline-hh100.parquetpipeline/tours/stop_frequency.parquet b/test/regress/reference-pipeline-hh100.parquetpipeline/tours/stop_frequency.parquet
index cd08358..258049c 100644
Binary files a/test/regress/reference-pipeline-hh100.parquetpipeline/tours/stop_frequency.parquet and b/test/regress/reference-pipeline-hh100.parquetpipeline/tours/stop_frequency.parquet differ
diff --git a/uv.lock b/uv.lock
index 05ca730..f217851 100644
--- a/uv.lock
+++ b/uv.lock
@@ -8,8 +8,8 @@ resolution-markers = [
 
 [[package]]
 name = "activitysim"
-version = "1.5.2.dev17+g279e4f9ac"
-source = { git = "https://github.com/ActivitySim/ActivitySim?branch=main#279e4f9acc25d0d204f8ed4b9c44f5b9ce7bd15e" }
+version = "1.5.2.dev30+ge23bb128b"
+source = { git = "https://github.com/ActivitySim/ActivitySim?branch=main#e23bb128b314f5f6f6d24e26334c15edfb88cdc2" }
 dependencies = [
     { name = "cytoolz" },
     { name = "multimethod" },