diff --git a/.github/workflows/SimPathsBuild.yml b/.github/workflows/SimPathsBuild.yml
index 78da582..9156807 100644
--- a/.github/workflows/SimPathsBuild.yml
+++ b/.github/workflows/SimPathsBuild.yml
@@ -5,9 +5,9 @@ name: Build and run SimPaths
 
 on:
   push:
-    branches: [ "main", "develop", "main-MV-test-merge" ]
+    branches: [ "main", "develop" ]
   pull_request:
-    branches: [ "main", "develop", "main-MV-test-merge" ]
+    branches: [ "main", "develop" ]
 
 jobs:
   build:
diff --git a/src/main/java/simpaths/model/taxes/DonorTaxImputation.java b/src/main/java/simpaths/model/taxes/DonorTaxImputation.java
index 3231d3d..c87da4e 100644
--- a/src/main/java/simpaths/model/taxes/DonorTaxImputation.java
+++ b/src/main/java/simpaths/model/taxes/DonorTaxImputation.java
@@ -375,7 +375,7 @@ private double[] getMeasurementVector(int priceYear, double originalIncomePerWee
     }
     private double[] getCandidateMeasVector(DonorTaxUnit candidate, boolean flagSecondIncome, boolean flagChildcareCost) {
 
-        int priceYear = Parameters.BASE_PRICE_YEAR;
+        int priceYear = getSystemYear(keys.getSimYear());
         double oiWeekly = candidate.getPolicyBySystemYear(priceYear).getOriginalIncomePerMonth() / Parameters.WEEKS_PER_MONTH;
         double siWeekly = 0.0;
         if (flagSecondIncome)
diff --git a/src/test/java/simpaths/integrationtest/expected_training/AlignmentAdjustmentFactors1.csv b/src/test/java/simpaths/integrationtest/expected_training/AlignmentAdjustmentFactors1.csv
index ed970e3..4986094 100644
--- a/src/test/java/simpaths/integrationtest/expected_training/AlignmentAdjustmentFactors1.csv
+++ b/src/test/java/simpaths/integrationtest/expected_training/AlignmentAdjustmentFactors1.csv
@@ -1,9 +1,9 @@
 run,time,id_AlignmentAdjustmentFactors1,alignDsblAdj,alignDsblSimShare,alignDsblTgtShare,alignEmpSimACFShare,alignEmpSimACMShare,alignEmpSimCouplesShare,alignEmpSimFWithDepShare,alignEmpSimMWithDepShare,alignEmpSimSingleFShare,alignEmpSimSingleMShare,alignEmpTgtACFShare,alignEmpTgtACMShare,alignEmpTgtCouplesShare,alignEmpTgtFWithDepShare,alignEmpTgtMWithDepShare,alignEmpTgtSingleFShare,alignEmpTgtSingleMShare,alignFertAdj,alignFertRateSim,alignFertRateTarget,alignInSchoolAdj,alignInSchoolSimShare,alignInSchoolTgtShare,alignPartnerAdj,alignPartnerSimShare,alignPartnerTargetShare,alignRtrdAdj,alignRtrdSimShare,alignRtrdTgtShare,alignUtilAdjACF,alignUtilAdjACM,alignUtilAdjCouple,alignUtilAdjFWithDep,alignUtilAdjMWithDep,alignUtilAdjSingleF,alignUtilAdjSingleM
 1,2019.0,1,0.0,0.026860235722595983,0.025373056530952454,0.4274193548387097,0.5936599423631124,0.8623188405797102,0.3564516129032258,0.4181494661921708,0.3370865587614356,0.49528301886792453,0.43507510852753173,0.5848354452867963,0.8485838971605224,0.35911211251470115,0.42573558591756905,0.31149821531271515,0.48737889167035214,0.0,0.04554913294797688,0.045651243869546033,0.0,0.28100470957613816,0.24873124063014984,0.0,0.5968786626364814,0.6240660548210144,0.0,0.20592847387323587,0.22542138397693634,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-1,2020.0,1,0.0,0.026511134676564158,0.024366777390241623,0.6068759342301944,0.7073446327683616,0.7107268464243846,0.3546511627906977,0.2523076923076923,0.3301079270561965,0.5504132231404959,0.4801393849492098,0.5887200233002405,0.8619214351053303,0.3444800764987814,0.40892825601147326,0.31156186771356276,0.5001271710550154,0.0,0.047440990885720964,0.044438469959742405,0.0,0.26645056726094,0.2708786725997925,1.2512999611441233,0.6269098077870873,0.6326462626457214,0.0,0.21784578094228146,0.24411079287528992,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-1,2021.0,1,0.0,0.024747474747474747,0.028718793764710426,0.49853801169590645,0.6279863481228669,0.7252238805970149,0.3277310924369748,0.24324324324324326,0.3234750462107209,0.5552531301034295,0.4520973681205755,0.626590807007037,0.8770974046349561,0.35895948770059627,0.43199836014063375,0.31841282100364365,0.5269170906500584,0.0,0.04180366369187412,0.043316396226479134,0.0,0.3622994652406417,0.39477697014808655,0.5560813314704958,0.6240068978259531,0.6212343573570251,0.0,0.22303030303030302,0.2472914308309555,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-1,2022.0,1,0.0,0.02289565754270426,0.02631850354373455,0.4382183908045977,0.5714285714285714,0.7002457002457002,0.3220588235294118,0.2400611620795107,0.3253102670176758,0.5407326407873154,0.43644259131027485,0.6127048026252832,0.8758363009161576,0.35891959698901466,0.43793085708406215,0.3423060634517299,0.533009508555799,0.0,0.04049466537342386,0.04161423864730309,0.0,0.43597883597883597,0.422437846660614,0.5560813314704958,0.6189068494873892,0.6152040362358093,0.0,0.22412018933937025,0.24316592514514923,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+1,2020.0,1,0.0,0.026511134676564158,0.024366777390241623,0.6098654708520179,0.7107344632768362,0.7113130128956624,0.35174418604651164,0.26153846153846155,0.3301079270561965,0.5548209366391185,0.4801393849492098,0.5887200233002405,0.8619214351053303,0.3444800764987814,0.40892825601147326,0.31156186771356276,0.5001271710550154,0.0,0.047440990885720964,0.044438469959742405,0.0,0.26645056726094,0.2708786725997925,1.2512999611441233,0.6269098077870873,0.6326462626457214,0.0,0.21784578094228146,0.24411079287528992,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+1,2021.0,1,0.0,0.024847229937881927,0.028718793764710426,0.5014577259475219,0.6336746302616609,0.7288616671646251,0.3290960451977401,0.2410179640718563,0.32470414201183434,0.5659251220835594,0.4520973681205755,0.626590807007037,0.8770974046349561,0.35895948770059627,0.43199836014063375,0.31841282100364365,0.5269170906500584,0.0,0.04184297132110954,0.043316396226479134,0.0,0.3619015734851021,0.39477697014808655,0.534423335385881,0.6235062215104102,0.6212343573570251,0.0,0.22317054694207364,0.2472914308309555,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+1,2022.0,1,0.0,0.022998559374356863,0.02631850354373455,0.4471428571428571,0.5820045558086561,0.7042795566502463,0.32215743440233235,0.26132930513595165,0.3279549718574109,0.555858310626703,0.43644259131027485,0.6127048026252832,0.8758363009161576,0.35891959698901466,0.43793085708406215,0.3423060634517299,0.533009508555799,0.0,0.04047503635482307,0.04161423864730309,0.0,0.43388284812346545,0.422437846660614,0.534423335385881,0.6178319919517102,0.6152040362358093,0.0,0.22391438567606503,0.24316592514514923,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 2,2019.0,1,0.0,0.026709834075273168,0.025373056530952454,0.4274193548387097,0.5936599423631124,0.8624282694050136,0.3580645161290323,0.41725352112676056,0.33696799155821316,0.49264705882352944,0.43507510852753173,0.5848354452867963,0.8485838971605224,0.35911211251470115,0.42573558591756905,0.31149821531271515,0.48737889167035214,0.0,0.04552807950080887,0.045651243869546033,0.0,0.2810929648241206,0.24873124063014984,0.0,0.5969394051585832,0.6240660548210144,0.0,0.20604006475111292,0.22542138397693634,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-2,2020.0,1,0.0,0.025879029410280988,0.024366777390241623,0.6197836166924265,0.75,0.7487452022438736,0.35427807486631013,0.26424050632911394,0.3196415235250187,0.5619100499722376,0.4801393849492098,0.5887200233002405,0.8619214351053303,0.3444800764987814,0.40892825601147326,0.31156186771356276,0.5001271710550154,0.0,0.046696240952603316,0.044438469959742405,0.0,0.26245954692556633,0.2708786725997925,1.1707433785015025,0.6302634819010096,0.6326462626457214,0.0,0.21853402613126166,0.24411079287528992,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-2,2021.0,1,0.0,0.02623627757075234,0.028718793764710426,0.5173453996983409,0.6678121420389461,0.7684432399879554,0.31841432225063937,0.26572327044025157,0.3200292932991578,0.5564603691639523,0.4520973681205755,0.626590807007037,0.8770974046349561,0.35895948770059627,0.43199836014063375,0.31841282100364365,0.5269170906500584,0.0,0.041335824381130315,0.043316396226479134,0.0,0.3572847682119205,0.39477697014808655,0.35876243588779017,0.6247312488482093,0.6212343573570251,0.0,0.2225299627354215,0.2472914308309555,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-2,2022.0,1,0.0,0.025240322829383644,0.02631850354373455,0.46097201767304863,0.6132723112128147,0.7522691705790298,0.32360742705570295,0.2571428571428571,0.315867707172055,0.5485621269669018,0.43644259131027485,0.6127048026252832,0.8758363009161576,0.35891959698901466,0.43793085708406215,0.3423060634517299,0.533009508555799,0.0,0.04039671020803096,0.04161423864730309,0.0,0.42912145607280366,0.422437846660614,0.35876243588779017,0.6176267353476977,0.6152040362358093,0.0,0.22346167686218063,0.24316592514514923,0.0,0.0,0.0,0.0,0.0,0.0,0.0
\ No newline at end of file
+2,2020.0,1,0.0,0.025879029410280988,0.024366777390241623,0.624420401854714,0.7522727272727273,0.7530262769412459,0.3516042780748663,0.2721518987341772,0.32113517550410753,0.5652415324819545,0.4801393849492098,0.5887200233002405,0.8619214351053303,0.3444800764987814,0.40892825601147326,0.31156186771356276,0.5001271710550154,0.0,0.046696240952603316,0.044438469959742405,0.0,0.26245954692556633,0.2708786725997925,1.1707433785015025,0.6302634819010096,0.6326462626457214,0.0,0.21853402613126166,0.24411079287528992,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+2,2021.0,1,0.0,0.026139511458071016,0.028718793764710426,0.5227272727272727,0.6731651376146789,0.776173285198556,0.3281653746770026,0.2563291139240506,0.32442328817283045,0.5655471289274107,0.4520973681205755,0.626590807007037,0.8770974046349561,0.35895948770059627,0.43199836014063375,0.31841282100364365,0.5269170906500584,0.0,0.04135514018691589,0.043316396226479134,0.0,0.35536366655596147,0.39477697014808655,0.365760409311517,0.6245928839181466,0.6212343573570251,0.0,0.22281541173507932,0.2472914308309555,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+2,2022.0,1,0.0,0.02564497892897523,0.02631850354373455,0.4667651403249631,0.6208476517754868,0.7575093867334167,0.33026315789473687,0.2586750788643533,0.32084569732937684,0.5687126561651277,0.43644259131027485,0.6127048026252832,0.8758363009161576,0.35891959698901466,0.43793085708406215,0.3423060634517299,0.533009508555799,0.0,0.040357660705654906,0.04161423864730309,0.0,0.42337298810356894,0.422437846660614,0.365760409311517,0.6176267353476977,0.6152040362358093,0.0,0.22330146983245966,0.24316592514514923,0.0,0.0,0.0,0.0,0.0,0.0,0.0
\ No newline at end of file
diff --git a/src/test/java/simpaths/integrationtest/expected_training/EmploymentStatistics1.csv b/src/test/java/simpaths/integrationtest/expected_training/EmploymentStatistics1.csv
index 2489ee5..c8a8a58 100644
--- a/src/test/java/simpaths/integrationtest/expected_training/EmploymentStatistics1.csv
+++ b/src/test/java/simpaths/integrationtest/expected_training/EmploymentStatistics1.csv
@@ -1,9 +1,9 @@
 run,time,id_EmploymentStatistics1,labEmpShare,labEmpToNotEmpShare,labNotEmpToEmpShare,labUnempShare
 1,2019.0,1,0.6764008867823561,0.0,0.0,0.18836480391407384
-1,2020.0,1,0.6262493220732935,0.22784668678064587,0.45368975903614456,0.24219415820872395
-1,2021.0,1,0.6228943038470579,0.17349810351156247,0.4354243542435424,0.22753271174488757
-1,2022.0,1,0.6067216028437551,0.1905125270253084,0.42871553463349027,0.23436742607852643
+1,2020.0,1,0.6277213914929883,0.2259470331880657,0.45256024096385544,0.2407220887890292
+1,2021.0,1,0.6272727272727273,0.16723591119785314,0.43265052762259465,0.2231974921630094
+1,2022.0,1,0.6141058747579083,0.17988883274381,0.4246668944311582,0.22708198837959975
 2,2019.0,1,0.6766370869033048,0.0,0.0,0.18834149326805386
-2,2020.0,1,0.6464396284829721,0.20185640796242452,0.4613943028485757,0.2226780185758514
-2,2021.0,1,0.6450706424166732,0.15938425103611603,0.44927055702917773,0.20677542736710638
-2,2022.0,1,0.6328634716069271,0.17102516881522406,0.4485809067453004,0.2098268223922674
\ No newline at end of file
+2,2020.0,1,0.6503095975232198,0.19771863117870722,0.4636431784107946,0.2188080495356037
+2,2021.0,1,0.6526628143057942,0.15229681978798587,0.45368811047490737,0.19982820552865843
+2,2022.0,1,0.640860388302586,0.1612668365489625,0.44085203499429443,0.20357689519052607
\ No newline at end of file
diff --git a/src/test/java/simpaths/integrationtest/expected_training/HealthStatistics1.csv b/src/test/java/simpaths/integrationtest/expected_training/HealthStatistics1.csv
index 0de4173..74f303d 100644
--- a/src/test/java/simpaths/integrationtest/expected_training/HealthStatistics1.csv
+++ b/src/test/java/simpaths/integrationtest/expected_training/HealthStatistics1.csv
@@ -5,21 +5,21 @@ run,time,id_HealthStatistics1,demSex,nObsTotal,nObsValidDhe,nObsValidDlltsd,prop
 1,2020.0,1,Total,12907,12907,12907,0.20725187882544355,0.04896567753931975,0.1879600216936546,0.012861238087859302,0.5429611838537228,0.03811885023630588
 1,2020.0,1,Male,6473,6473,6473,0.22338946392708173,0.05020855862814769,0.1717905144446161,0.014521860033987331,0.5400896029661671,0.0477367526649158
 1,2020.0,1,Female,6434,6434,6434,0.19101647497668636,0.047715262667081135,0.2042275411874417,0.011190550202051602,0.5458501709667392,0.028442648430214486
-1,2021.0,1,Total,12763,12763,12763,0.19564365744730863,0.04591397006973282,0.19587871190159054,0.013163049439786884,0.5494006111415811,0.03517981665752566
-1,2021.0,1,Male,6403,6403,6403,0.21895986256442293,0.04763392159925035,0.17804154302670624,0.015149148836482898,0.5402155239731375,0.04451038575667656
-1,2021.0,1,Female,6360,6360,6360,0.1721698113207547,0.044182389937106915,0.2138364779874214,0.011163522012578616,0.5586477987421383,0.02578616352201258
-1,2022.0,1,Total,12378,12378,12378,0.18128938439166262,0.04701890450799806,0.1911455808692842,0.012199062853449669,0.5683470673776054,0.03223460979156568
-1,2022.0,1,Male,6220,6220,6220,0.20659163987138263,0.048392282958199355,0.17491961414790996,0.01382636655948553,0.5562700964630225,0.04067524115755627
-1,2022.0,1,Female,6158,6158,6158,0.15573238064306594,0.045631698603442676,0.20753491393309517,0.01055537512179279,0.5805456316986034,0.023708996427411498
+1,2021.0,1,Total,12760,12760,12760,0.19545454545454546,0.0463166144200627,0.19553291536050157,0.012852664576802508,0.5498432601880878,0.0353448275862069
+1,2021.0,1,Male,6403,6403,6403,0.21864750898016555,0.04763392159925035,0.1769483054818054,0.01483679525222552,0.5419334686865532,0.04451038575667656
+1,2021.0,1,Female,6357,6357,6357,0.1720937549158408,0.044989775051124746,0.2142520056630486,0.010854176498348278,0.5578102878716376,0.026112946358345133
+1,2022.0,1,Total,12392,12392,12392,0.18197224015493868,0.046078114912846996,0.19141381536475147,0.012023886378308587,0.5685119431891543,0.03227888960619755
+1,2022.0,1,Male,6227,6227,6227,0.2063594026015738,0.04769551951180344,0.17504416251806648,0.013810823831700658,0.5570900915368556,0.040950698570740324
+1,2022.0,1,Female,6165,6165,6165,0.1573398215733982,0.044444444444444446,0.20794809407948095,0.010218978102189781,0.5800486618004866,0.023519870235198703
 2,2019.0,1,Total,13072,12960,13072,0.22901234567901235,0.0525462962962963,0.18888888888888888,0.010108024691358025,0.5194444444444445,0.03756119951040392
 2,2019.0,1,Male,6548,6492,6548,0.24152803450400492,0.05468268638324091,0.16959334565619225,0.01155268022181146,0.5226432532347505,0.04718998167379353
 2,2019.0,1,Female,6524,6468,6524,0.21645021645021645,0.05040197897340754,0.2082560296846011,0.008658008658008658,0.5162337662337663,0.027896995708154508
 2,2020.0,1,Total,12920,12920,12920,0.20371517027863778,0.04674922600619195,0.18521671826625388,0.014860681114551083,0.5494582043343653,0.037229102167182664
 2,2020.0,1,Male,6482,6482,6482,0.21644554149953718,0.04890465905584696,0.17016352977476087,0.016044430731255787,0.5484418389385992,0.04659055846960815
 2,2020.0,1,Female,6438,6438,6438,0.1908977943460702,0.04457906182044113,0.20037278657968313,0.013668841255048152,0.5504815159987574,0.02780366573470022
-2,2021.0,1,Total,12811,12811,12811,0.1953789711966279,0.0431660291936617,0.18726094762313636,0.016392162984934823,0.5578018890016392,0.03731168527047069
-2,2021.0,1,Male,6426,6426,6426,0.21413009648303766,0.04403983815748522,0.17258014316837847,0.018207282913165267,0.5510426392779334,0.0457516339869281
-2,2021.0,1,Female,6385,6385,6385,0.1765074393108849,0.042286609240407204,0.20203602192638997,0.01456538762725137,0.5646045418950666,0.028817541111981208
-2,2022.0,1,Total,12415,12415,12415,0.18058799838904552,0.04236810310108739,0.18485702778896496,0.015465163109142166,0.57672170761176,0.03592428513894483
-2,2022.0,1,Male,6242,6242,6242,0.20041653316244792,0.04245434155719321,0.1736622877282922,0.018103172060237104,0.5653636654918296,0.043735982057033
-2,2022.0,1,Female,6173,6173,6173,0.16053782601652358,0.042280900696581886,0.19617689940061558,0.012797667260651223,0.5882067066256277,0.028025271342945083
\ No newline at end of file
+2,2021.0,1,Total,12806,12806,12806,0.19475245978447603,0.04294861783538966,0.18709979697017023,0.016320474777448073,0.558878650632516,0.03717007652662814
+2,2021.0,1,Male,6426,6426,6426,0.2131963896669779,0.04357298474945534,0.17258014316837847,0.01805166511048864,0.5525988173046996,0.046062869592281355
+2,2021.0,1,Female,6380,6380,6380,0.1761755485893417,0.04231974921630094,0.20172413793103447,0.014576802507836991,0.5652037617554859,0.02821316614420063
+2,2022.0,1,Total,12413,12413,12413,0.18069765568355756,0.04092483686457746,0.1833561588657053,0.016112140497865142,0.5789092080882945,0.03649399822766455
+2,2022.0,1,Male,6238,6238,6238,0.20294966335363898,0.04135941006732927,0.17072779737095223,0.018595703751202307,0.5663674254568772,0.04504648925937801
+2,2022.0,1,Female,6175,6175,6175,0.15821862348178137,0.04048582995951417,0.19611336032388663,0.013603238866396762,0.5915789473684211,0.02785425101214575
\ No newline at end of file
diff --git a/src/test/java/simpaths/integrationtest/expected_training/Statistics1.csv b/src/test/java/simpaths/integrationtest/expected_training/Statistics1.csv
index 56b94c9..6bdeab3 100644
--- a/src/test/java/simpaths/integrationtest/expected_training/Statistics1.csv
+++ b/src/test/java/simpaths/integrationtest/expected_training/Statistics1.csv
@@ -1,9 +1,9 @@
 run,time,id_Statistics1,demEdiP50,statSIndexP50,statYHhDispEquivNatGini,statYMktNatGini,yHhDispEquivP50,yHhQuintilesC5P20,yHhQuintilesC5P40,yHhQuintilesC5P60,yHhQuintilesC5P80,yLabP20,yLabP40,yLabP60,yLabP80
 1,2019.0,1,4887.48,NaN,0.0,0.0,4896.12,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-1,2020.0,1,12102.486187845307,NaN,0.0,0.0,12102.486187845307,0.0,0.10662784588338556,6.780516758446868,7.454248346472741,0.0,369.47825006454065,727.7605524794651,1197.19374067443
-1,2021.0,1,11745.35894269153,NaN,0.0,0.0,11752.556551091282,0.0,0.0,6.721652266075725,7.448920000234098,0.0,381.1186709636464,727.4706704553955,1224.6128242418251
-1,2022.0,1,11711.956281739898,NaN,0.0,0.0,11711.956281739898,0.0,0.0,6.698600649559103,7.48375803907212,0.0,367.4845769212528,735.9554826070638,1280.7825967470296
+1,2020.0,1,12145.649530429495,NaN,0.0,0.0,12150.146764666473,0.0,0.17657549725031518,6.772597027295391,7.457899238145645,0.0,381.99091193815497,727.5741147384757,1193.8833948811114
+1,2021.0,1,11810.024063736488,NaN,0.0,0.0,11812.930390240976,0.0,0.0,6.724113016981417,7.470483486257651,0.0,394.45009595858915,739.3360389273913,1229.3533884213973
+1,2022.0,1,11711.956281739898,NaN,0.0,0.0,11711.956281739898,0.0,0.0,6.725603720081203,7.480799290450726,0.0,391.98687167423446,743.5546273560735,1277.0460035438434
 2,2019.0,1,4894.08,NaN,0.0,0.0,4902.12,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-2,2020.0,1,12464.088397790056,NaN,0.0,0.0,12464.088397790056,0.0,3.251019529685701,6.842410595900004,7.474155922736251,0.0,419.4831847938827,757.7175305300341,1234.9830199859448
-2,2021.0,1,12109.606299212599,NaN,0.0,0.0,12109.606299212599,0.0,0.03313510419069235,6.78384928674171,7.4768151790852,0.0,428.4456360476579,766.4131733944771,1272.065656218361
-2,2022.0,1,11770.200927357033,NaN,0.0,0.0,11770.200927357033,0.0,0.0,6.792292130879358,7.508877744338672,0.0,418.2769139689721,788.2886349730823,1312.3111245541882
\ No newline at end of file
+2,2020.0,1,12464.088397790056,NaN,0.0,0.0,12464.088397790056,0.0,3.495879873613822,6.8398846530193325,7.476588872378178,0.0,429.7304532982417,755.6369709168806,1231.817310804134
+2,2021.0,1,12109.606299212599,NaN,0.0,0.0,12109.606299212599,0.0,0.05033333456669138,6.804062572398014,7.498192258691687,0.10701904494492485,438.7720857521536,778.4817147425998,1280.300854890991
+2,2022.0,1,11770.200927357033,NaN,0.0,0.0,11770.200927357033,0.0,0.0,6.7806965274144915,7.508303833525941,0.0,433.85639800101063,798.434220797724,1310.013523701904
\ No newline at end of file
diff --git a/src/test/java/simpaths/integrationtest/expected_training/Statistics21.csv b/src/test/java/simpaths/integrationtest/expected_training/Statistics21.csv
index a9cb6db..cc84387 100644
--- a/src/test/java/simpaths/integrationtest/expected_training/Statistics21.csv
+++ b/src/test/java/simpaths/integrationtest/expected_training/Statistics21.csv
@@ -1,9 +1,9 @@
 run,time,id_Statistics21,demDsbl18to29Share,demDsbl30to54Share,demDsbl55to74Share,demMarried18to29Share,demMarried30to54Share,demMarried55to74Share,demNChild18to29Avg,demNChild30to54Avg,demNChild55to74Avg,demPop18to29N,demPop30to54N,demPop55to74N,healthScore18to29Avg,healthScore30to54Avg,healthScore55to74Avg,labNoWork18to29Share,labNoWork18to74Share,labNoWork30to54Share,labNoWork55to74Share,labWorkFullTime18to29Share,labWorkFullTime30to54Share,labWorkFullTime55to74Share,labWorkPartTime18to29Share,labWorkPartTime30to54Share,labWorkPartTime55to74Share,statInvestLoss18to29Avg,statInvestLoss30to54Avg,statInvestLoss55to74Avg,statYDisp18to29Avg,statYDisp30to54Avg,statYDisp55to74Avg,statYDispGrossOfLosses18to29Avg,statYDispGrossOfLosses30to54Avg,statYDispGrossOfLosses55to74Avg,statYInvest18to29Avg,statYInvest30to54Avg,statYInvest55to74Avg,statYLab18to29Avg,statYLab30to54Avg,statYLab55to74Avg,statYPens18to29Avg,statYPens30to54Avg,statYPens55to74Avg,wealth18to29Avg,wealth30to54Avg,wealth55to74Avg,x18to29Avg,x18to54Avg,x30to54Avg,x55to74Avg,xToLeisureRatio
 1,2019.0,1,0.00887784090909091,0.025311145294364425,0.06689995883079457,0.2595880681818182,0.7449307789120403,0.6556195965417867,0.2830255681818182,0.8387638092574465,0.024083985179086043,2816.0,7151.0,4858.0,4.325994318181818,3.931338274367221,3.2326060107039933,0.07630699090909088,0.012854759190556508,-0.03365960911760593,0.10572905730753401,0.5387073863636364,0.774716822821983,0.2599835323178263,0.04225852272727273,0.05439798629562299,0.03314121037463977,0.0,0.0,0.0,-850.9857214907538,-1576.5396929502936,-1622.5281103052334,435.22649993781744,522.9812257997063,456.3174843376236,0.0,0.0,0.0,192.39022557653212,234.54668909348757,215.4242407162864,0.0,0.0,0.0,0.0,0.0,0.0,-720.34744375,-1108.3894350892856,-1343.6696142857143,-1403.9432562499999,NaN
-1,2020.0,1,0.011743119266055046,0.02491252624212736,0.06294561010389081,0.3295412844036697,0.7802659202239328,0.6640863719698513,0.32073394495412844,0.843666899930021,0.027907924220818905,2725.0,7145.0,4909.0,4.307522935779817,3.933659902029391,3.231411692809126,0.0018600559633027425,0.06841388568915352,0.06599403834849546,0.1662198623344877,0.5941284403669724,0.6281315605318405,0.19515176206966794,0.06128440366972477,0.1013296011196641,0.037482175595844366,0.0,0.0,0.0,-659.4176526652553,-1184.1533474068783,-980.7687542560725,626.7945687633159,915.3675713431218,1098.0768403867846,0.0,0.0,0.0,183.4917383046733,228.99521583314336,217.27358090811865,0.0,0.0,0.0,0.0,0.0,0.0,-720.34744375,-1108.3894350892856,-1343.6696142857143,-1403.9432562499999,NaN
-1,2021.0,1,0.00911854103343465,0.021829810901001112,0.06117886178861789,0.3130699088145897,0.7757230255839822,0.6672764227642276,0.3240881458966565,0.8367630700778643,0.02621951219512195,2632.0,7192.0,4920.0,4.270136778115502,3.9306173526140156,3.228252032520325,0.07824554437689968,0.07565226380900708,0.05059980511679643,0.16856924715447164,0.5338145896656535,0.6468298109010011,0.1910569105691057,0.04521276595744681,0.09802558398220244,0.03922764227642277,0.0,0.0,0.0,-721.161350253874,-1200.5417515082636,-968.0344723707153,565.0508711746971,898.9791672417364,1110.8111222721418,0.0,0.0,0.0,189.6950053963626,230.26493226633534,215.11722432811496,0.0,0.0,0.0,0.0,0.0,0.0,-720.34744375,-1108.3894350892856,-1343.6696142857143,-1403.9432562499999,NaN
-1,2022.0,1,0.010462776659959759,0.0211864406779661,0.05502689284236657,0.28450704225352114,0.7733050847457628,0.6665287546545304,0.3352112676056338,0.8374293785310735,0.02772031443938767,2485.0,7080.0,4834.0,4.2486921529175055,3.9255649717514123,3.237484484898635,0.1252809482897384,0.09374224353080074,0.0779410757062147,0.15805942681009522,0.47364185110663987,0.6326271186440678,0.2012825817128672,0.05835010060362173,0.08488700564971752,0.03951179147703765,0.0,0.0,0.0,-767.0546021267954,-1185.4171491613465,-972.091449034267,519.1576193017758,914.1037695886534,1106.75414560859,0.0,0.0,0.0,190.72979490314495,243.2318162818591,218.0721928744449,0.0,0.0,0.0,0.0,0.0,0.0,-720.34744375,-1108.3894350892856,-1343.6696142857143,-1403.9432562499999,NaN
+1,2020.0,1,0.011743119266055046,0.02491252624212736,0.06294561010389081,0.3295412844036697,0.7802659202239328,0.6640863719698513,0.32073394495412844,0.843666899930021,0.027907924220818905,2725.0,7145.0,4909.0,4.307522935779817,3.933659902029391,3.231411692809126,-0.004011503669724803,0.06692528700182693,0.06543420629811056,0.165812447382359,0.5941284403669724,0.6309307207837649,0.19739254430637604,0.0671559633027523,0.09909027291812457,0.035648808311265025,0.0,0.0,0.0,-652.6363552568629,-1182.8387706895073,-979.4299583998481,633.5758661717083,916.6821480604928,1099.415636243009,0.0,0.0,0.0,181.8638270134188,229.48713067719004,218.2026058152189,0.0,0.0,0.0,0.0,0.0,0.0,-720.34744375,-1108.3894350892856,-1343.6696142857143,-1403.9432562499999,NaN
+1,2021.0,1,0.009135896459840122,0.021551724137931036,0.06195409303270363,0.3113818043395508,0.7760011123470523,0.6658541539711558,0.323943661971831,0.8382925472747497,0.026203534430225474,2627.0,7192.0,4923.0,4.270650932622764,3.9315906562847607,3.2277066829169208,0.07067221480776553,0.07205118618911954,0.04615041690767521,0.16810019447491376,0.5317853064331938,0.6543381535038932,0.191549867966687,0.05481537875904073,0.09496662958843159,0.03920373755839935,0.0,0.0,0.0,-710.7158873685324,-1200.923228157928,-972.60557569309,575.4963340600387,898.597690592072,1106.240018949767,0.0,0.0,0.0,184.77430931555054,231.28676186055696,213.12469186729257,0.0,0.0,0.0,0.0,0.0,0.0,-720.34744375,-1108.3894350892856,-1343.6696142857143,-1403.9432562499999,NaN
+1,2022.0,1,0.010004001600640256,0.021336724600819555,0.05547505692403229,0.2849139655862345,0.7730676840469125,0.6638377147588491,0.33653461384553823,0.8362300409778155,0.027737528462016145,2499.0,7077.0,4831.0,4.249299719887955,3.9287833827893177,3.235975988408197,0.11665665350140053,0.0873705926147012,0.07028916919598702,0.1548049488304699,0.48779511804721887,0.6429277942631059,0.20948043883253983,0.05282112845138055,0.08223823654090716,0.03456841233699027,0.0,0.0,0.0,-759.8130623757363,-1188.9129100816535,-965.2710554592989,526.3991590528349,910.6080086683464,1113.5745391835583,0.0,0.0,0.0,185.48979440654173,240.94107689193604,216.90519182276424,0.0,0.0,0.0,0.0,0.0,0.0,-720.34744375,-1108.3894350892856,-1343.6696142857143,-1403.9432562499999,NaN
 2,2019.0,1,0.00887784090909091,0.02531822632536019,0.06630971993410215,0.2595880681818182,0.7455588194153029,0.6556836902800659,0.2830255681818182,0.8399776192474472,0.023887973640856673,2816.0,7149.0,4856.0,4.325994318181818,3.9307595467897607,3.230848434925865,0.07630699090909088,0.013028474691316405,-0.033471922674499915,0.10602019209225699,0.5387073863636364,0.7747936774374038,0.2598846787479407,0.04225852272727273,0.054133445237096095,0.032948929159802305,0.0,0.0,0.0,-850.9857214907538,-1575.6849974820452,-1622.553842306169,435.22649993781744,523.8359212679546,456.2917523366883,0.0,0.0,0.0,192.22907495056845,234.68042846722906,216.6656369471743,0.0,0.0,0.0,0.0,0.0,0.0,-720.34744375,-1108.3894350892856,-1343.6696142857143,-1403.9432562499999,NaN
-2,2020.0,1,0.011730205278592375,0.02433906840117499,0.0615071283095723,0.3460410557184751,0.7770317526926843,0.6674134419551935,0.32331378299120234,0.8434746118338229,0.02790224032586558,2728.0,7149.0,4910.0,4.30058651026393,3.9339767799692265,3.229735234215886,-0.016114196774193568,0.0511288550618787,0.036607808756469434,0.16708190590631367,0.6114369501466276,0.6649881102252063,0.1934826883910387,0.06195014662756598,0.09385928101832425,0.038289205702647655,0.0,0.0,0.0,-647.6548316392544,-1161.6078278598538,-977.7237859138472,638.5573897893167,937.9130908901461,1101.12180872901,0.0,0.0,0.0,182.89999257688572,235.13687396708673,220.0269549775427,0.0,0.0,0.0,0.0,0.0,0.0,-720.34744375,-1108.3894350892856,-1343.6696142857143,-1403.9432562499999,NaN
-2,2021.0,1,0.010530274539300489,0.02370390906570557,0.06403740597682456,0.3328318916886047,0.7698918769060161,0.670054889205123,0.32831891688604736,0.8351815913501525,0.026224842447651962,2659.0,7214.0,4919.0,4.275667544189545,3.936373717771001,3.2295181947550313,0.05855157619405793,0.05659399383450514,0.018216497477127808,0.17055536535881277,0.5494546822113576,0.6900471305794289,0.18926611099817037,0.04926664159458443,0.0871915719434433,0.03903232364301688,0.0,0.0,0.0,-708.8706584284186,-1179.4613231718508,-964.1699613985929,577.3415630001526,920.059595578149,1114.6756332442642,0.0,0.0,0.0,184.53399106224103,237.66585915301607,216.62171519572797,0.0,0.0,0.0,0.0,0.0,0.0,-720.34744375,-1108.3894350892856,-1343.6696142857143,-1403.9432562499999,NaN
-2,2022.0,1,0.01157222665602554,0.024111675126903553,0.05938340575212084,0.3060654429369513,0.763677382966723,0.6666666666666666,0.3503591380686353,0.8298082346305696,0.027312228429546864,2506.0,7092.0,4833.0,4.257781324820431,3.932741116751269,3.244154769294434,0.11896483934557062,0.07210926598295336,0.03361086835871405,0.16235473109869647,0.48643256185155626,0.6797800338409475,0.20070349679288227,0.05187549880287311,0.08206429780033841,0.03579557210842127,0.0,0.0,0.0,-756.7269520515651,-1171.2312531131322,-969.3032389885957,529.485269377006,928.2896656368678,1109.5423556542614,0.0,0.0,0.0,189.96174328344804,245.83204803508576,220.6056288418454,0.0,0.0,0.0,0.0,0.0,0.0,-720.34744375,-1108.3894350892856,-1343.6696142857143,-1403.9432562499999,NaN
\ No newline at end of file
+2,2020.0,1,0.011730205278592375,0.02433906840117499,0.0615071283095723,0.3460410557184751,0.7770317526926843,0.6674134419551935,0.32331378299120234,0.8434746118338229,0.02790224032586558,2728.0,7149.0,4910.0,4.30058651026393,3.9339767799692265,3.229735234215886,-0.020146454838709693,0.047747506580104127,0.03157213943208839,0.1664709079429736,0.6173020527859238,0.6696041404392222,0.1975560081466395,0.060117302052785926,0.09427892012868933,0.03482688391038696,0.0,0.0,0.0,-646.5570086596861,-1161.7520180887786,-975.1599452550342,639.6552127688851,937.7689006612212,1103.6856493878229,0.0,0.0,0.0,181.64492866115864,234.8558032383162,219.07075011984315,0.0,0.0,0.0,0.0,0.0,0.0,-720.34744375,-1108.3894350892856,-1343.6696142857143,-1403.9432562499999,NaN
+2,2021.0,1,0.010570026425066062,0.02328159645232816,0.06401137980085349,0.3318233295583239,0.7694013303769401,0.6699857752489331,0.3250283125707814,0.836890243902439,0.02662060556797399,2649.0,7216.0,4921.0,4.274443186107965,3.9373614190687363,3.231050599471652,0.04949638055870137,0.05021122578114434,0.008454091352549903,0.17044494001219268,0.5511513778784447,0.6970620842572062,0.18979882137776874,0.056625141562853906,0.0899390243902439,0.03861003861003861,0.0,0.0,0.0,-698.2230757953796,-1179.5081101419546,-968.2077172240356,587.9891456331916,920.0128086080455,1110.6378774188215,0.0,0.0,0.0,181.81523627544723,236.7084807243395,217.5381733212979,0.0,0.0,0.0,0.0,0.0,0.0,-720.34744375,-1108.3894350892856,-1343.6696142857143,-1403.9432562499999,NaN
+2,2022.0,1,0.011961722488038277,0.024686133446184227,0.060028979507348375,0.3090111642743222,0.7641416278741713,0.6648726971641482,0.3484848484848485,0.8314289744674849,0.02815152142413579,2508.0,7089.0,4831.0,4.248803827751196,3.938778389053463,3.2457048230180088,0.10862856188197767,0.0645793756029942,0.02764591801382424,0.15397696290623064,0.49681020733652315,0.694315136126393,0.20823845994618093,0.051834130781499205,0.07349414585978276,0.03663837714758849,0.0,0.0,0.0,-744.2198319723151,-1169.8112127466732,-960.9179980186634,541.9923894562561,929.7097060033268,1117.9275966241937,0.0,0.0,0.0,183.24906298543695,247.55232202199986,216.85220343494868,0.0,0.0,0.0,0.0,0.0,0.0,-720.34744375,-1108.3894350892856,-1343.6696142857143,-1403.9432562499999,NaN
\ No newline at end of file