diff --git a/input/reg_education.xlsx b/input/reg_education.xlsx
index d009d987e..0e200355f 100644
Binary files a/input/reg_education.xlsx and b/input/reg_education.xlsx differ
diff --git a/src/main/java/simpaths/data/Parameters.java b/src/main/java/simpaths/data/Parameters.java
index 8be2b036e..f8ae669c0 100644
--- a/src/main/java/simpaths/data/Parameters.java
+++ b/src/main/java/simpaths/data/Parameters.java
@@ -1194,7 +1194,7 @@ else if(country.equals(Country.UK)) {
             columnsFinancialDistress = 50;
             columnsEducationE1a = 24;
             columnsEducationE1b = 29;
-            columnsEducationE2a = 24;
+            columnsEducationE2a = 30;
             columnsPartnershipU1a = 16;
             columnsPartnershipU1b = 29;
             columnsPartnershipU2b = 38;
diff --git a/src/main/java/simpaths/model/Person.java b/src/main/java/simpaths/model/Person.java
index 66018a4f3..aae64ff25 100644
--- a/src/main/java/simpaths/model/Person.java
+++ b/src/main/java/simpaths/model/Person.java
@@ -2308,6 +2308,12 @@ public enum DoublesVariables {
         Dag_L1,
         Dag_sq,
         Dag_sq_L1,
+        Dag_u22,
+        Dag_sq_u22,
+        Dag_cb_u22,
+        Dag_22o,
+        Dag_sq_22o,
+        Dag_cb_22o,
         DagCeiling54,
         Dag_sqCeiling54,
         Dcpagdf_L1, 					//Lag(1) of age difference between partners
@@ -2655,6 +2661,24 @@ public double getDoubleValue(Enum<?> variableID) {
             case Dag_sq_L1 -> {
                 return (double) (dag - 1) * (dag - 1);
             }
+            case Dag_u22 -> {
+                return (double) dag < 22 ? dag : 0;
+            }
+            case Dag_sq_u22 -> {
+                return (double) dag < 22 ? dag * dag : 0;
+            }
+            case Dag_cb_u22 -> {
+                return (double) dag < 22 ? dag * dag * dag  : 0;
+            }
+            case Dag_22o -> {
+                return (double) dag >= 22 ? dag : 0;
+            }
+            case Dag_sq_22o -> {
+                return (double) dag >= 22 ? dag * dag : 0;
+            }
+            case Dag_cb_22o -> {
+                return (double) dag >= 22 ? dag * dag * dag : 0;
+            }
             case DagCeiling54 -> {
                 return (double) Math.min(dag, 54);
             }
diff --git a/src/test/java/simpaths/integrationtest/expected/EmploymentStatistics1.csv b/src/test/java/simpaths/integrationtest/expected/EmploymentStatistics1.csv
index 87c63be0f..da16e732d 100644
--- a/src/test/java/simpaths/integrationtest/expected/EmploymentStatistics1.csv
+++ b/src/test/java/simpaths/integrationtest/expected/EmploymentStatistics1.csv
@@ -1,9 +1,9 @@
 run,time,id_EmploymentStatistics1,EmpToNotEmp,NotEmpToEmp,PropEmployed,PropUnemployed,
 1,2019.0,1,0.0905460951262478,0.35991649269311066,0.6919775503466491,0.17076592934962034,
-1,2020.0,1,0.09059346859064772,0.22426631625054752,0.6728191774527074,0.19721222332848282,
-1,2021.0,1,0.070926143024619,0.2753338570306363,0.6740042758729907,0.19083062791986696,
-1,2022.0,1,0.06203789279112754,0.25500400320256206,0.6777068054569829,0.18713035249585994,
+1,2020.0,1,0.09134250731390182,0.22665497588776853,0.6733726000152988,0.1968178688900788,
+1,2021.0,1,0.06870407092033128,0.27419354838709675,0.6768769242914661,0.18891608115575906,
+1,2022.0,1,0.05772554441755963,0.2506122448979592,0.6821019359936784,0.18214144606874752,
 2,2019.0,1,0.0901937756899589,0.36018363939899833,0.6924346176058082,0.17053048428347495,
-2,2020.0,1,0.0899837574445046,0.2289740202553941,0.6737767584097859,0.19441896024464833,
-2,2021.0,1,0.07079957731595632,0.27059291683247116,0.6729824005073728,0.19185032503567465,
-2,2022.0,1,0.05959268687803749,0.2591993530125354,0.679737528658392,0.185152976519883,
\ No newline at end of file
+2,2020.0,1,0.08905742145178765,0.22880983750548967,0.6748278500382555,0.19418515684774293,
+2,2021.0,1,0.07120345511847788,0.2751004016064257,0.6766780252000951,0.18907995879229733,
+2,2022.0,1,0.05922263109475621,0.25805136567468406,0.6826285894603976,0.1834174818554749,
\ No newline at end of file
diff --git a/src/test/java/simpaths/integrationtest/expected/HealthStatistics1.csv b/src/test/java/simpaths/integrationtest/expected/HealthStatistics1.csv
index d19d6fb0d..5570a4498 100644
--- a/src/test/java/simpaths/integrationtest/expected/HealthStatistics1.csv
+++ b/src/test/java/simpaths/integrationtest/expected/HealthStatistics1.csv
@@ -2,24 +2,24 @@ run,time,id_HealthStatistics1,N,dhe_mcs_mean,dhe_mcs_median,dhe_mcs_p_10,dhe_mcs
 1,2019.0,1,11901,47.61009495000377,49.97,33.0,42.31,54.79,57.73,51.79902781278939,54.89,38.22,48.864999999999995,57.76,60.05,11.458700949500042,10.0,6.0,8.0,13.0,19.0,5.109486597764894,6.0,3.0,4.0,6.0,6.0,Total,9959.214461392088,95555.42857142857,
 1,2019.0,1,5857,48.734925729896126,51.0,34.77,44.379999999999995,55.34,58.15,52.17924364008878,55.0,40.3,49.41,57.57,59.72,10.857094075465255,10.0,6.0,7.0,12.0,18.0,5.113027147003585,5.0,3.0,5.0,6.0,6.0,Male,4994.497379400034,47059.57142857143,
 1,2019.0,1,6044,46.52006618133682,48.87,31.43,40.61,54.37,57.33,51.43057577763053,54.8,36.58,48.0,57.76,60.41,12.041694242223693,11.0,6.0,8.0,14.0,21.0,5.106055592322965,6.0,3.0,4.0,6.0,7.0,Female,4964.717081992105,48495.857142857145,
-1,2020.0,1,12826,46.943292526866514,48.366526371419326,37.93351582332674,43.700856385107784,51.46846463525187,53.54584219181414,52.00815555855841,54.43150179441825,41.95341119318125,49.55103351988515,56.851427331649305,58.22572469060568,11.838740357000832,11.495894404330068,4.927165859963634,8.002354442893825,15.334961692954918,19.074488722118698,5.122797442694527,5.0,4.0,5.0,6.0,6.0,Total,10784.27611117098,103250.71428571429,
-1,2020.0,1,6202,48.0433841060167,49.277177202247614,39.64908693285845,45.40199133535671,52.0933498993683,54.08600993811607,52.452660680437305,54.57417784553519,43.58739220948566,50.2309801241524,56.95461381317418,58.324747349652014,11.171397233633023,10.902106220597087,4.404458643221568,7.511460708314802,14.625344686832383,18.045983780920764,5.103192518542405,5.0,4.0,5.0,6.0,6.0,Male,5316.573411839523,49735.71428571428,
-1,2020.0,1,6624,45.91328528443138,47.31065132517311,36.70075188646388,42.37598271413436,50.79204455374422,52.844164213341614,51.591968848732066,54.246743414889664,40.60616981501177,48.82530016641519,56.7944423495926,58.152958301465056,12.463568565202456,12.083186551769758,5.470447717489775,8.538913442065123,16.026267170271204,20.08588485220175,5.141153381642512,5.0,4.0,5.0,6.0,6.0,Female,5467.702699331416,53515.0,
-1,2021.0,1,12392,46.3736498265545,47.162648029370054,40.15722611850441,43.94650500198553,49.52223400146926,51.36306228601121,51.757732460312006,53.45363841970169,43.55595530641323,49.5976991821336,55.85009902478853,57.445098057179784,12.039563067153107,11.922223801831613,4.996183972070412,8.265255394793032,15.668991416985094,19.108550664977862,5.097482246610717,5.0,4.0,5.0,5.0,6.0,Total,10338.88558424085,99264.0,
-1,2021.0,1,6005,47.38081077505444,48.24699627863947,41.39497227279515,45.1270607981105,50.29923457877511,51.98534550312183,52.33388612864798,53.78680611612318,45.129465807396855,50.282005721122715,56.201342030188414,57.68165349222692,11.403353246315067,11.30461082427523,4.47948746945611,7.708390148038262,14.924593458325205,18.33102309423582,5.054454621149042,5.0,4.0,5.0,5.0,6.0,Male,5114.1307597079585,47696.0,
-1,2021.0,1,6387,45.42672615413522,46.21736527903425,39.089670161182525,42.99167430701094,48.6215609317415,50.42872561865636,51.21603795923798,53.10583754674186,42.31343450294979,48.70188162066195,55.520661125259046,57.199856421469796,12.63772182308433,12.571414488338235,5.401764638277565,8.729389213207627,16.353742068073117,19.94423496664796,5.137936433380304,5.0,4.0,5.0,6.0,6.0,Female,5224.75482453289,51568.0,
-1,2022.0,1,12447,45.9067684825106,46.3420299563685,41.029642766075995,43.77444723246026,48.51127449943578,50.13649986220413,51.57020201108495,52.775258975815916,44.60374329968826,49.29494555452378,55.23642544795763,56.95156371770119,12.184400055737559,12.121581349891834,5.079431957225332,8.44608746945596,15.79175132754164,19.253088127481973,5.059532417449988,5.0,4.0,5.0,5.0,6.0,Total,10307.55318038355,98962.28571428571,
-1,2022.0,1,6032,46.876376927486696,47.436118444198804,41.944737766295354,44.95322193457366,49.34033983355798,50.816703493361196,52.20881209320616,53.25194503012069,45.911028930977274,50.18256463511359,55.61806740141252,57.28898140313048,11.472636899376502,11.431670687445461,4.540769476754584,7.7388506569687685,14.99987216746992,18.498973593950495,5.011770557029178,5.0,4.0,5.0,5.0,6.0,Male,5102.366612771909,47505.857142857145,
-1,2022.0,1,6415,44.995049364803116,45.34566508666595,40.284244741388044,42.89774401061289,47.49306798420158,49.15863931952595,50.9697193898283,52.24254806086533,43.55011778864991,48.48639407799905,54.776720709815926,56.50172675444915,12.853668233316698,12.779833274245965,5.7305470643156555,9.158332338751237,16.531646995273178,19.95342194184516,5.104442712392829,5.0,4.0,5.0,5.0,6.0,Female,5205.186567611601,51456.42857142857,
+1,2020.0,1,12837,46.93725003884436,48.36313763369126,37.93517588921402,43.68821020706035,51.46742949577866,53.535789680124225,52.014815165938444,54.42634037036059,42.03452282386929,49.52544908810884,56.84808032663567,58.21331839126508,11.821698630730232,11.494560416182242,4.921574492418364,7.989227734154161,15.301838917916374,19.019680161151346,5.122536418166238,5.0,4.0,5.0,6.0,6.0,Total,10794.363548414061,103334.0,
+1,2020.0,1,6213,48.00136889647978,49.18402098554201,39.590779814373,45.309654282986685,52.10101980160499,54.08838469381398,52.432079489827025,54.54681913694374,43.57225089189644,50.162767851601544,56.94732225410365,58.32745560496484,11.17292763095294,10.905522637086875,4.404559712028201,7.4972101893646,14.625696862969914,18.045961384469567,5.099468855625302,5.0,4.0,5.0,6.0,6.0,Male,5321.548216822041,49787.57142857143,
+1,2020.0,1,6624,45.93915667192265,47.31794552547059,36.799058374448975,42.42004443107726,50.78633606189385,52.83157004620962,51.623440883885614,54.26043505704449,40.77572490505065,48.85084376902742,56.79052665212042,58.137433618250085,12.430215270467079,12.050349836987902,5.447974396523341,8.514827512117215,15.987535269245594,20.064080579217784,5.14417270531401,5.0,4.0,5.0,6.0,6.0,Female,5472.815331591965,53546.42857142857,
+1,2021.0,1,12426,46.388248695712065,47.16649329180498,40.18193019427427,43.984114539743146,49.52610299441536,51.360056798734966,51.79215317250699,53.47229584829719,43.7339853950392,49.604697037594946,55.877599854959016,57.45000768953017,12.009741571233064,11.942957579802727,4.945715150358577,8.242829698984275,15.624873142802793,19.10779768434655,5.099468855625302,5.0,4.0,5.0,5.0,6.0,Total,10375.255908788344,99575.14285714286,
+1,2021.0,1,6016,47.37044169080671,48.25501045927417,41.31791664675986,45.11295510129577,50.323616318019575,51.99605849698418,52.322473926851146,53.80478872926895,45.0582765733964,50.21443359830572,56.21500494918915,57.66795469160239,11.351132019541991,11.282738362903132,4.4460218047532125,7.7075176471636535,14.802652345430785,18.222971582183046,5.055352393617022,5.0,4.0,5.0,5.0,6.0,Male,5121.682081661204,47791.857142857145,
+1,2021.0,1,6410,45.466427625745034,46.24776407143592,39.16050729863089,43.055666583134716,48.59120722944558,50.40790890584086,51.29442935688529,53.145114216298765,42.57353730284554,48.823671543610885,55.572215649374535,57.198806493584755,12.62786872614308,12.648588398077656,5.381556236587767,8.728415662314543,16.39226323029612,19.877728254757663,5.140873634945398,5.0,4.0,5.0,6.0,6.0,Female,5253.573827127114,51783.28571428571,
+1,2022.0,1,12420,45.92707722914152,46.36022252830317,41.021092293787476,43.79101643294344,48.52862731999129,50.158910292633976,51.59171167964739,52.80936147185487,44.62210190967186,49.29498553019063,55.27596852792316,56.934450761664486,12.157088446178566,12.120901274951901,5.0950946422160515,8.471496077453846,15.72963893285055,19.18698606008884,5.065056360708534,5.0,4.0,5.0,5.0,6.0,Total,10291.765423543553,98855.42857142857,
+1,2022.0,1,6013,46.879661726331726,47.46497761686617,41.88763197378763,44.94388327113212,49.383665849589676,50.83192757670052,52.18107480401341,53.269287902678506,45.86912908928372,50.10191757896682,55.62802159194564,57.27585384444575,11.499436935552028,11.480018723018494,4.530340251880749,7.7590130595264135,15.015560902018011,18.45787827540941,5.014967570264427,5.0,4.0,5.0,5.0,6.0,Male,5084.128762170524,47386.42857142857,
+1,2022.0,1,6407,45.0330721438283,45.406381991222496,40.401918441942406,42.969845706418575,47.478012940005506,49.1289771795608,51.03859158181468,52.35690014443865,43.60568974649748,48.541953423972615,54.8740641768318,56.57070485075149,12.774297519597845,12.676099366196889,5.757394928530903,9.096117811880546,16.416767594232425,19.809626072452062,5.112064928983924,5.0,4.0,5.0,5.0,6.0,Female,5207.636661373054,51469.0,
 2,2019.0,1,11907,47.586078777189414,49.98,32.967999999999996,42.22,54.79,57.73,51.81769379356735,54.98,38.227999999999994,48.88,57.76,60.08200000000001,11.467120181405896,10.0,6.0,8.0,13.0,19.0,5.107835726883346,6.0,3.0,4.0,6.0,6.0,Total,9964.58653657535,95572.71428571429,
 2,2019.0,1,5862,48.71830433299245,51.0,34.659,44.3575,55.3,58.15,52.20262538382805,55.0,40.415000000000006,49.45,57.58,59.72,10.861821903787103,10.0,6.0,7.0,12.0,18.0,5.1132719208461275,5.0,3.0,5.0,6.0,6.0,Male,4999.899852778956,47102.0,
 2,2019.0,1,6045,46.488129032257966,48.87,31.318,40.53,54.37,57.33,51.444415219189246,54.8,36.58,48.0,57.76,60.42,12.05409429280397,11.0,6.0,8.0,14.0,21.0,5.102564102564102,6.0,3.0,4.0,6.0,7.0,Female,4964.686683796456,48470.71428571428,
-2,2020.0,1,12845,46.8943907391439,48.350554865080625,37.828872274266644,43.62805356928378,51.459560516858545,53.51683435066312,52.02370218382992,54.433601869152156,42.07550869519429,49.564212064271345,56.82872756212411,58.210407079329464,11.824140190654514,11.467245016055564,4.926927068952009,7.978090824769531,15.329544833125995,19.09122294515114,5.121136629038537,5.0,4.0,5.0,6.0,6.0,Total,10796.769532685732,103370.14285714286,
-2,2020.0,1,6224,47.96899417570204,49.18402098554201,39.43858198765237,45.293284485567774,52.07394297312881,54.045384576849315,52.46957183486846,54.57906838055987,43.81012620762393,50.21954392130845,56.92039773670731,58.311158811958315,11.185117519435014,10.927660466221665,4.44708704895973,7.514005676596507,14.614312897317667,18.029534764177356,5.100739074550129,5.0,4.0,5.0,6.0,6.0,Male,5332.225349262266,49888.142857142855,
-2,2020.0,1,6621,45.884221310184316,47.332310886620654,36.587789444728934,42.29380442906302,50.76583433342208,52.849478871806284,51.60456720300243,54.250672045062565,40.616082800853974,48.83815864738823,56.77147987940553,58.118184740187296,12.424846595377467,12.018705697962497,5.3708913149072846,8.484208247667068,16.01820735564978,20.082233001931503,5.140311131249056,5.0,4.0,5.0,6.0,6.0,Female,5464.5441834233925,53482.0,
-2,2021.0,1,12377,46.375521259774125,47.15568126202504,40.11917374836849,43.95911212778073,49.52213980184484,51.35953139988363,51.786930070277975,53.463401311629575,43.71027120349299,49.62057095740343,55.84278197105513,57.42085511065392,12.024720407180856,11.915797307189411,4.91834336453621,8.257742334829466,15.656637289305744,19.107541363081005,5.102044114082572,5.0,4.0,5.0,6.0,6.0,Total,10331.367001527977,99232.57142857142,
-2,2021.0,1,6007,47.35320566626662,48.21783558004387,41.39476992099278,45.1270607981105,50.29597546987339,51.99441094529906,52.34174661717516,53.791301515286406,45.25409167930417,50.281444671690004,56.192768799796916,57.66258565937774,11.433402977786962,11.313378598121375,4.62556667152762,7.792629366412121,14.953314619405578,18.307986046798455,5.05410354586316,5.0,4.0,5.0,5.0,6.0,Male,5114.592653347977,47708.57142857143,
-2,2021.0,1,6370,45.45355105101435,46.253580404415615,39.09479084880615,43.039460070312394,48.61516702864053,50.42904590395287,51.26373022770162,53.147274101291124,42.548802053394986,48.823671543610885,55.522269909732614,57.18430303887879,12.582341097662637,12.532152785088485,5.249683641766505,8.670952741531945,16.34757901397839,19.92761493142018,5.147252747252748,5.0,4.0,5.0,6.0,6.0,Female,5216.774348179943,51524.0,
-2,2022.0,1,12415,45.93027952183788,46.35968102663099,41.026642644299876,43.84286743019593,48.50239659443895,50.161266104215294,51.61100896394658,52.80887402649098,44.68976598431965,49.37283544472107,55.24758118595533,56.94241478048266,12.123247686097221,12.088632888884675,5.099994929636304,8.396241666322098,15.704133277945056,19.120553425952902,5.06532420459122,5.0,4.0,5.0,5.0,6.0,Total,10290.983879579622,98820.85714285714,
-2,2022.0,1,6007,46.87774871532713,47.426879878544554,41.89304724419556,44.97416752794771,49.34749615875357,50.837276881550935,52.22211516818635,53.2559067206558,45.97057986000124,50.174110959454616,55.63566775323229,57.28508864243988,11.46849508355423,11.480018723018494,4.553972133927307,7.773018470963829,14.95689309144465,18.265215460120576,5.0114865989678705,5.0,4.0,5.0,5.0,6.0,Male,5082.461558246085,47306.28571428571,
-2,2022.0,1,6408,45.04210108156178,45.42457458812706,40.37118048224564,43.03872500952719,47.509441871443954,49.16340844975285,51.03814458053992,52.313567971049295,43.67474211036657,48.57752501254542,54.864186481499615,56.53339181278622,12.737027162295046,12.660157488489755,5.707398834414216,8.986738475300323,16.39282877778357,19.7895569278263,5.115792759051186,5.0,4.0,5.0,5.0,6.0,Female,5208.522321333565,51514.57142857143,
\ No newline at end of file
+2,2020.0,1,12833,46.91382282723353,48.350554865080625,37.863681877033706,43.68710699183573,51.45531950509873,53.52892822565593,52.02471454049237,54.42302363192503,42.07307631339701,49.56763554733742,56.83944692787872,58.20932783170164,11.814413932457475,11.455596192516555,4.926449486928758,7.971225261276212,15.300201715809973,19.064583169651776,5.1204706615756255,5.0,4.0,5.0,6.0,6.0,Total,10789.10794357607,103260.14285714286,
+2,2020.0,1,6211,47.984742510930836,49.18402098554201,39.539993333217794,45.34630478355003,52.07352007846587,54.04504375793923,52.47886393678976,54.58214477073402,43.82975618544725,50.231241776175466,56.95518086694206,58.32027170673232,11.177179097345332,10.927379315373424,4.423673537849095,7.508104366863095,14.599401365876963,18.026508141754213,5.100949927547899,5.0,4.0,5.0,6.0,6.0,Male,5322.926415854388,49786.0,
+2,2020.0,1,6622,45.90937067449343,47.33012538664292,36.59968835142425,42.37097427847275,50.77497434110704,52.86361086924275,51.59875230847816,54.25167884521301,40.537010438627604,48.8394071235646,56.77049103220396,58.09105234288945,12.412098251527587,12.017223233198333,5.384272021472406,8.496289607345748,15.995924152972101,20.082233001931503,5.1387798248263366,5.0,4.0,5.0,6.0,6.0,Female,5466.181527721622,53474.142857142855,
+2,2021.0,1,12385,46.382559419023764,47.14159603279567,40.15331045334085,43.991804563463006,49.52290653900358,51.36192474714024,51.81382312321611,53.48342871440436,43.90318596589858,49.6524148195429,55.858831763495985,57.41494602443014,12.027391470486812,11.972379240831904,4.994973502299768,8.258934571863564,15.63964004230524,19.080579497898636,5.101170771094066,5.0,4.0,5.0,5.0,6.0,Total,10343.38579505146,99279.71428571429,
+2,2021.0,1,6000,47.3525249417641,48.227495110059124,41.30826832358087,45.14240182299422,50.27486862946879,52.000063790482365,52.35434876753014,53.80846266163549,45.34150187003079,50.2436932212686,56.22674563597997,57.66984830638053,11.418401746099397,11.342604135741459,4.626244505883284,7.790718910461417,14.867113059344382,18.233190323739223,5.0565,5.0,4.0,5.0,5.0,6.0,Male,5109.574104525702,47675.57142857143,
+2,2021.0,1,6385,45.471080462650875,46.24776407143592,39.15438755981726,43.105051174985235,48.62465222446046,50.42890815929008,51.3058898630928,53.18274326790534,42.60631603404921,48.92747548889421,55.55037920222565,57.14643468067316,12.599660592855585,12.552885628513124,5.341259206773536,8.700247708078,16.322658700640943,19.841270481439594,5.1431480031323416,5.0,4.0,5.0,6.0,6.0,Female,5233.811690525784,51604.142857142855,
+2,2022.0,1,12444,45.940675524033125,46.35631548384594,41.1038825362961,43.85466101443346,48.506966620988095,50.14078489955941,51.63401823044349,52.85221093866993,44.86722999233476,49.392856213431145,55.24376488995539,56.93138132867817,12.150471049707187,12.089771133596471,5.128194009604467,8.44792644634642,15.727908714183535,19.187262045022464,5.0651719704275155,5.0,4.0,5.0,5.0,6.0,Total,10319.935390998016,99048.71428571429,
+2,2022.0,1,6033,46.888573772874196,47.44289991740021,41.92882767414638,44.98799590555109,49.34352293532838,50.83165780842082,52.23440141914467,53.27017206234932,45.96641101457506,50.15408155397383,55.670770834272204,57.320393441102205,11.496175198548185,11.460184815264677,4.568556158457476,7.7918366255296245,14.999295183385495,18.419159815369305,5.015746726338472,5.0,4.0,5.0,5.0,6.0,Male,5106.14706999006,47551.42857142857,
+2,2022.0,1,6411,45.04866645598477,45.424198218995905,40.46746347104298,43.040931183012624,47.50062469074394,49.19037926607219,51.06903433129519,52.37030421306711,43.78371756109634,48.646761274956106,54.85536884858465,56.49023927173997,12.766188858168055,12.646738917275552,5.801977919353929,9.041143321260689,16.402538503819653,19.86455996574541,5.111683044766807,5.0,4.0,5.0,5.0,6.0,Female,5213.788321007945,51497.28571428571,
\ No newline at end of file
diff --git a/src/test/java/simpaths/integrationtest/expected/Statistics1.csv b/src/test/java/simpaths/integrationtest/expected/Statistics1.csv
index 2607a7166..9c420bfe7 100644
--- a/src/test/java/simpaths/integrationtest/expected/Statistics1.csv
+++ b/src/test/java/simpaths/integrationtest/expected/Statistics1.csv
@@ -1,9 +1,9 @@
 run,time,id_Statistics1,edi_p50,giniEquivalisedHouseholdDisposableIncomeNational,giniMarketIncomeNational,grossLabourIncome_p20,grossLabourIncome_p40,grossLabourIncome_p60,grossLabourIncome_p80,medianEquivalisedHouseholdDisposableIncome,sIndex_p50,ydses_p20,ydses_p40,ydses_p60,ydses_p80,
 1,2019.0,1,11710.826601350129,0.0,0.0,629.0225592833064,1256.7997320334398,1863.977007377612,2822.356847997243,11710.826601350129,NaN,0.0,0.0,7.677087763295096,8.254591617183976,
-1,2020.0,1,12024.725900296515,0.0,0.0,0.0,1080.3569576524903,1806.568517136928,2843.6491613241315,12024.725900296515,NaN,0.0,0.0,7.688262181097593,8.303518955710432,
-1,2021.0,1,11865.829278189776,0.0,0.0,0.0,1233.1280052394086,1955.3338667028559,3033.804446546846,11862.969914031146,NaN,0.0,0.0,7.735585766688342,8.363504873994863,
-1,2022.0,1,12339.945688711285,0.0,0.0,27.86292061314274,1273.146100753053,2006.5360619859002,3088.040982623245,12336.21234584146,NaN,0.0,0.0,7.773515710900749,8.3892060368051,
+1,2020.0,1,12024.725900296515,0.0,0.0,0.0,1079.1873433429664,1806.0274358380248,2840.7964275423105,12024.725900296515,NaN,0.0,0.0,7.687101953793663,8.303140530738661,
+1,2021.0,1,12071.462660020243,0.0,0.0,0.0,1230.6020360313694,1961.4295688891834,3033.6357060708133,12070.787881366372,NaN,0.0,0.0,7.746360796220401,8.367243446741623,
+1,2022.0,1,12426.85573285835,0.0,0.0,216.97751677677903,1278.2952809749283,2028.8853589889795,3087.7993675425155,12426.571229527724,NaN,0.0,0.0,7.78293434922552,8.399324734338569,
 2,2019.0,1,11710.826601350129,0.0,0.0,628.3272835669826,1255.1711549248664,1863.8967739684877,2822.1998469159994,11710.826601350129,NaN,0.0,0.0,7.677305869739233,8.25573270230405,
-2,2020.0,1,12024.725900296515,0.0,0.0,0.0,1085.4510921385522,1809.7404280323337,2837.907253288959,12024.725900296515,NaN,0.0,0.0,7.681324551867457,8.30133489320262,
-2,2021.0,1,11834.14149837555,0.0,0.0,0.0,1231.265262045304,1943.3633272488614,3012.899386084271,11834.14149837555,NaN,0.0,0.0,7.73293844597479,8.357194691530696,
-2,2022.0,1,12267.951972806783,0.0,0.0,148.38590500605866,1261.7141240151734,2013.1915731965116,3075.643798622905,12267.951972806783,NaN,0.0,0.0,7.764439243557929,8.394977488465818,
\ No newline at end of file
+2,2020.0,1,12024.725900296515,0.0,0.0,0.0,1085.2509182915849,1809.7404280323337,2836.7377308992523,12024.725900296515,NaN,0.0,0.0,7.683991835228723,8.30346358550098,
+2,2021.0,1,11853.328184235996,0.0,0.0,0.0,1234.417020436259,1958.3268397774598,3028.261470170822,11853.328184235996,NaN,0.0,0.0,7.741277957767225,8.368015063641442,
+2,2022.0,1,12319.297343010852,0.0,0.0,154.4800801948658,1270.8500729637854,2015.6497269728227,3095.589759646678,12319.297343010852,NaN,0.0,0.0,7.781209385446186,8.39143957443849,
\ No newline at end of file
diff --git a/src/test/java/simpaths/integrationtest/expected/Statistics21.csv b/src/test/java/simpaths/integrationtest/expected/Statistics21.csv
index f1727ebbc..276ed6af2 100644
--- a/src/test/java/simpaths/integrationtest/expected/Statistics21.csv
+++ b/src/test/java/simpaths/integrationtest/expected/Statistics21.csv
@@ -1,9 +1,9 @@
 run,time,id_Statistics21,aaconsToLeisRatio,aadisposableIncome18to29,aadisposableIncome30to54,aadisposableIncome55to74,aaexpenditure18to29,aaexpenditure18to54,aaexpenditure30to54,aaexpenditure55to74,aaworkNone18to29,aaworkNone18to74,aaworkNone30to54,aaworkNone55to74,avkids18to29,avkids30to54,avkids55to74,aworkFulltime18to29,aworkFulltime30to54,aworkFulltime55to74,aworkParttime18to29,aworkParttime30to54,aworkParttime55to74,dispIncomeGrossOfLosses18to29,dispIncomeGrossOfLosses30to54,dispIncomeGrossOfLosses55to74,health18to29,health30to54,health55to74,investmentIncome18to29,investmentIncome30to54,investmentIncome55to74,investmentLosses18to29,investmentLosses30to54,investmentLosses55to74,labourIncome18to29,labourIncome30to54,labourIncome55to74,pensionIncome18to29,pensionIncome30to54,pensionIncome55to74,population18to29,population30to54,population55to74,prDisabled18to29,prDisabled30to54,prDisabled55to74,prMarried18to29,prMarried30to54,prMarried55to74,wealth18to29,wealth30to54,wealth55to74,
 1,2019.0,1,0.2716261646439728,-94.12636263283412,-473.86419168724,-904.393306340088,-720.1422638587416,-1107.8964854612511,-1343.025068974074,-1403.853060282238,-0.0014899865979381421,-0.004280433700602326,-0.010691005183920521,0.0756902233747947,0.2986254295532646,0.9365202545398107,0.07932410232339826,0.5388316151202749,0.6411609498680739,0.23844168035672378,0.11993127147766323,0.16498525531584665,0.08472189626848158,1192.085858795737,1625.65672706276,1174.4522883027691,3.7670103092783505,3.481763153810337,3.0880075099741844,0.0,0.0,0.0,0.0,0.0,0.0,387.6113833330806,524.8842243746953,511.32365028511634,0.0,0.0,0.0,2910.0,6443.0,4261.0,0.04673539518900344,0.08427751047648611,0.1476179300633654,0.24673539518900345,0.6683222101505509,0.6284909645623094,0.0,0.0,0.0,
-1,2020.0,1,-0.7412824951960196,2.2777539738697214,-459.5994536786284,-857.426209006182,-719.9624001701977,-1107.754911463381,-1342.9072642979413,-1403.8283521958288,0.012222774686716786,0.008484792378990746,0.018927639823386994,0.08083909411764711,0.4451754385964912,0.9908844893889759,0.078125,0.5025062656641605,0.6211365902293121,0.23988970588235295,0.1425438596491228,0.15539096994730095,0.078125,1288.489975402441,1639.9214650713716,1221.419385636675,3.6400375939849625,3.455063381284717,3.018612132352941,0.0,0.0,0.0,0.0,0.0,0.0,424.9887468118768,550.8349260896671,537.8882382208272,0.0,0.0,0.0,3192.0,7021.0,4352.0,0.043233082706766915,0.07463324312775958,0.16268382352941177,0.20614035087719298,0.6519014385415183,0.5824908088235294,0.0,0.0,0.0,
-1,2021.0,1,6.038861140513146,37.24824645930994,-417.1918748228884,-848.7886913852717,-720.0272022896505,-1107.8721906605665,-1343.05540916668,-1403.8152814550617,-0.0026205043970686237,0.00773043184713379,0.021567959643916917,0.07000238705560624,0.3944037308461026,0.8838278931750742,0.0820419325432999,0.4870086608927382,0.6169139465875371,0.2506836827711942,0.17288474350433045,0.156973293768546,0.07816773017319964,1323.4604678878811,1682.3290439271116,1230.0569032575854,3.5436375749500333,3.351186943620178,2.9250227894257064,0.0,0.0,0.0,0.0,0.0,0.0,436.3312934270817,572.2156114443399,553.991922607467,0.0,0.0,0.0,3002.0,6740.0,4388.0,0.046302465023317786,0.07670623145400593,0.17160437556973565,0.13257828114590273,0.5881305637982196,0.5510483135824977,0.0,0.0,0.0,
-1,2022.0,1,-0.7308918046908721,63.26093996959662,-396.7957314274254,-824.6800308822899,-720.0044120022212,-1107.9715532922958,-1343.2168880953288,-1403.7984195501992,-0.011937451692103529,3.6322129223809174E-4,0.02031781696123572,0.05377537308479208,0.4117451891174519,0.8248923214020496,0.07956353716753807,0.5096217650962177,0.6373087776622605,0.27006137758581494,0.15958858659588587,0.1378286053765038,0.07501704932939304,1349.4731613981678,1702.7251873225746,1254.1655637605672,3.4648307896483077,3.251596613693747,2.857240281882246,0.0,0.0,0.0,0.0,0.0,0.0,445.9900071631031,581.0750339286341,564.1329265728774,0.0,0.0,0.0,3014.0,6733.0,4399.0,0.04678168546781686,0.07945937917718698,0.17799499886337805,0.08858659588586595,0.5406208228130105,0.5283018867924528,0.0,0.0,0.0,
+1,2020.0,1,-0.7396376636182903,-5.621248069030116,-463.8349997127432,-857.9100879815733,-719.9639074271228,-1107.758994586653,-1342.9133168275778,-1403.8284447935937,0.011210772607467834,0.007943255917667258,0.01881410878090367,0.08069288045977019,0.4461876372764355,0.9889173060528559,0.07908045977011494,0.5032946344524631,0.6209150326797386,0.24045977011494252,0.14276749294006902,0.15572605853935778,0.07770114942528736,1280.590973359541,1635.6859190372568,1220.9355066612839,3.6379039849388137,3.453537936913896,3.0181609195402297,0.0,0.0,0.0,0.0,0.0,0.0,421.1344072730098,547.7875858758484,536.8004426039937,0.0,0.0,0.0,3187.0,7038.0,4350.0,0.043928459366175086,0.07402671213412901,0.16344827586206898,0.20363978663319737,0.6486217675475987,0.5822988505747126,0.0,0.0,0.0,
+1,2021.0,1,1.5371552433731444,38.77780105679335,-408.424041231664,-845.6590489551822,-720.0265934858982,-1107.8812634823505,-1343.0691822790654,-1403.8270916888673,-0.002885935208471191,0.004777550674292197,0.015455200000000002,0.07045480204964705,0.40502978160158837,0.8838518518518519,0.08244135732179458,0.4870946393117141,0.6231111111111111,0.2511956274197222,0.17306419589675712,0.15688888888888888,0.07720337053063084,1324.9900224853645,1691.096877518336,1233.1865456876749,3.5483123759099935,3.35037037037037,2.923252106581644,0.0,0.0,0.0,0.0,0.0,0.0,438.90331654560987,570.3704066679483,555.31520937226,0.0,0.0,0.0,3022.0,6750.0,4391.0,0.04765056254136334,0.07466666666666667,0.17330904122067867,0.13203176704169425,0.5860740740740741,0.5499886130721932,0.0,0.0,0.0,
+1,2022.0,1,-0.7009976618537205,56.02181676497776,-379.9602302386759,-820.5446534857722,-720.0351181878289,-1107.9669137995809,-1343.194728823921,-1403.797937152153,-0.007176717559028933,-0.0032109451596912253,0.010305356552855222,0.052813409711822135,0.41137346192218155,0.8279409572088863,0.08191513501248014,0.5071499833721317,0.6424630982555539,0.27002496029044704,0.15729963418689724,0.14268674519159089,0.07601542999773088,1342.234038193549,1719.560688511324,1258.300941157085,3.475557033588294,3.243775160280304,2.855911050601316,0.0,0.0,0.0,0.0,0.0,0.0,447.33816219552267,580.8714739620286,563.7719690651974,0.0,0.0,0.0,3007.0,6707.0,4407.0,0.05021616228799468,0.07603995825257194,0.18084864987519855,0.08513468573328899,0.537498136275533,0.5239391876560018,0.0,0.0,0.0,
 2,2019.0,1,0.2845876542239716,-93.61108118972129,-472.3171099199144,-905.4313624145807,-720.1422638587416,-1107.8933571687894,-1343.0202640508362,-1403.855755672931,-0.0014899865979381421,-0.004372881938325968,-0.011086421454038126,0.0764776553651092,0.2986254295532646,0.9344287707332196,0.07912655552946701,0.5388316151202749,0.6414509378390947,0.23784926038976287,0.11993127147766323,0.16509068361494342,0.08452688424512797,1192.60114023885,1627.2038088300856,1173.4142322282764,3.7670103092783505,3.4822508138273136,3.0861704625498945,0.0,0.0,0.0,0.0,0.0,0.0,387.8666844244328,524.7776607256557,510.80211830770696,0.0,0.0,0.0,2910.0,6451.0,4259.0,0.04673539518900344,0.08417299643466129,0.1472176567269312,0.24673539518900345,0.667803441326926,0.6273773186193943,0.0,0.0,0.0,
-2,2020.0,1,-0.7401859408108667,-3.65652400649833,-470.3594224205442,-856.9316119517496,-719.9627661628167,-1107.7484995791774,-1342.8972697857114,-1403.8336901877963,0.012939775391358765,0.007676716420980445,0.018324518181818183,0.07938701075614807,0.44145272385723233,0.9867897727272728,0.07952194897724661,0.5015654351909831,0.615909090909091,0.24063433693403816,0.1427676894176581,0.1612215909090909,0.07883245230981384,1282.5556974220729,1629.1614963294558,1221.9139826911075,3.6333750782717598,3.4428977272727272,3.016777752240864,0.0,0.0,0.0,0.0,0.0,0.0,423.65794829018756,545.4157231087064,537.4620744923544,0.0,0.0,0.0,3194.0,7040.0,4351.0,0.04351909830932999,0.07528409090909091,0.16134222017926914,0.21102066374452097,0.6481534090909091,0.5828545162031716,0.0,0.0,0.0,
-2,2021.0,1,3.768372932834577,29.716396262071385,-430.91607377659193,-840.9584924421442,-720.0268141395673,-1107.8684002072016,-1343.0503022691519,-1403.8219898728742,-4.632018084393952E-4,0.008469982034570722,0.023861255209260912,0.06688658688524596,0.3868050904219692,0.8831997625408133,0.08128415300546447,0.4822505023442733,0.6150192935589196,0.25455373406193077,0.17548559946416611,0.15657465123181952,0.07741347905282331,1315.9286176906426,1668.604844973408,1237.887102200713,3.542866711319491,3.351291184327694,2.9234972677595628,0.0,0.0,0.0,0.0,0.0,0.0,436.16458811295627,568.2666073882294,557.0819406406845,0.0,0.0,0.0,2986.0,6738.0,4392.0,0.046215673141326186,0.07583852775304245,0.17053734061930784,0.13228399196249163,0.5934995547640249,0.5496357012750456,0.0,0.0,0.0,
-2,2022.0,1,-0.3934389035432281,72.57569096833754,-409.83224231218605,-812.2900371181581,-719.9994855060471,-1107.9596077300955,-1343.2012758965163,-1403.8044675810354,-0.013151503183023883,-0.0011375791002479763,0.0194874821700792,0.04903528820326686,0.4088196286472148,0.8320131519952174,0.08121597096188747,0.5106100795755968,0.6339859512778359,0.2731397459165154,0.15981432360742706,0.1419817665520849,0.07667876588021778,1358.7879123969087,1689.688676437814,1266.555557524699,3.47446949602122,3.2524286354804963,2.855036297640653,0.0,0.0,0.0,0.0,0.0,0.0,451.6194092675201,576.299940779068,568.0016971681073,0.0,0.0,0.0,3016.0,6691.0,4408.0,0.046087533156498675,0.07637124495591092,0.17558983666061706,0.08488063660477453,0.5492452548199074,0.5301724137931034,0.0,0.0,0.0,
\ No newline at end of file
+2,2020.0,1,-0.7356041067844614,-3.882030594810203,-462.36036417541595,-858.7604251130197,-719.9516035388953,-1107.738084179218,-1342.8873004622105,-1403.8347710076303,0.010748166123982439,0.0068034691642651635,0.0169193080312722,0.08055690701956275,0.44364433312460866,0.9883439943141435,0.07917146144994246,0.5037570444583594,0.6190476190476191,0.24004602991944765,0.1427676894176581,0.15948827292110873,0.07825086306098965,1282.330190833761,1637.160554574584,1220.0851695298375,3.6355666875391357,3.4460554371002132,3.0161104718066745,0.0,0.0,0.0,0.0,0.0,0.0,422.61947965021193,547.2266362492028,537.3627883393855,0.0,0.0,0.0,3194.0,7035.0,4345.0,0.043832185347526614,0.07448471926083866,0.161795166858458,0.2116468378209142,0.6436389481165601,0.5831990794016111,0.0,0.0,0.0,
+2,2021.0,1,7.532278887204714,27.840687632479785,-410.07228491331125,-839.5869166812527,-720.0248156795312,-1107.867533367163,-1343.0495197966075,-1403.8255153600974,-8.410620126624302E-4,0.005319293805309766,0.01710009311163896,0.06772344448495904,0.39986671109630123,0.8739608076009501,0.08067456700091158,0.4851716094635122,0.6239608076009501,0.25546946216955335,0.17294235254915027,0.1543942992874109,0.07566089334548769,1314.052909061051,1689.4486338366887,1239.2586779616045,3.542485838053982,3.348871733966746,2.9261622607110302,0.0,0.0,0.0,0.0,0.0,0.0,434.62939655485405,572.5133966453387,559.0729775640625,0.0,0.0,0.0,3001.0,6736.0,4388.0,0.047317560813062313,0.07467339667458432,0.17183226982680036,0.1339553482172609,0.5844714964370546,0.5487693710118505,0.0,0.0,0.0,
+2,2022.0,1,-0.40977782618841196,55.295742164051035,-393.2835893877691,-812.723996939545,-720.014204797536,-1107.9505613849997,-1343.1810686676477,-1403.8075455885728,-0.012727099999999991,-0.0037983071342713726,0.0156332415430267,0.04795668439700207,0.4023333333333333,0.8298219584569733,0.0794912559618442,0.5183333333333333,0.6403560830860534,0.27458550987962754,0.15166666666666667,0.1394658753709199,0.07631160572337042,1341.5079635926222,1706.2373293622309,1266.121597703312,3.467,3.2666172106824924,2.8503293209175564,0.0,0.0,0.0,0.0,0.0,0.0,442.16798038940937,581.8828160480113,566.1000752954905,0.0,0.0,0.0,3000.0,6740.0,4403.0,0.049,0.0755192878338279,0.17647058823529413,0.08533333333333333,0.5452522255192879,0.5305473540767658,0.0,0.0,0.0,
\ No newline at end of file
diff --git a/src/test/java/simpaths/integrationtest/expected/Statistics31.csv b/src/test/java/simpaths/integrationtest/expected/Statistics31.csv
index c394fb8d9..9a26a7d34 100644
--- a/src/test/java/simpaths/integrationtest/expected/Statistics31.csv
+++ b/src/test/java/simpaths/integrationtest/expected/Statistics31.csv
@@ -1,9 +1,9 @@
 run,time,id_Statistics31,fertilityAdjustmentFactor,fertilityRateSimulated,fertilityRateTarget,partnershipAdjustmentFactor,shareCohabitingSimulated,shareCohabitingTarget,socialCareAdjustmentFactor,utilityAdjustmentFactorCouples,utilityAdjustmentFactorSfemales,utilityAdjustmentFactorSmales,
 1,2019.0,1,-0.279462622342386,0.05992949471210341,0.06092462518117112,-0.613869665517935,0.5430255402750491,0.639752445827121,0.0,0.0,0.0,0.0,
-1,2020.0,1,-0.2659197918000082,0.21669180492709905,0.059320659210062375,-0.5988444469664678,0.5094559030540424,0.6494882472052341,0.0,0.0,0.0,0.0,
-1,2021.0,1,-0.25543875103684177,0.1679144385026738,0.0570746110314559,-0.5821259283872153,0.4567660910518053,0.6444373367775469,0.0,0.0,0.0,0.0,
-1,2022.0,1,-0.24930347300809638,0.1702127659574468,0.05798520015481514,-0.584760268520426,0.4185291547009614,0.6442540414107724,0.0,0.0,0.0,0.0,
+1,2020.0,1,-0.2659197918000082,0.21649484536082475,0.059320659210062375,-0.5988444469664678,0.5077054794520548,0.6494882472052341,0.0,0.0,0.0,0.0,
+1,2021.0,1,-0.25543875103684177,0.17154255319148937,0.0570746110314559,-0.5821259283872153,0.4546365914786967,0.6444373367775469,0.0,0.0,0.0,0.0,
+1,2022.0,1,-0.24930347300809638,0.17119275825346114,0.05798520015481514,-0.584760268520426,0.41575984990619136,0.6442540414107724,0.0,0.0,0.0,0.0,
 2,2019.0,1,-0.279462622342386,0.059964726631393295,0.06092462518117112,-0.613869665517935,0.542454991816694,0.639752445827121,0.0,0.0,0.0,0.0,
-2,2020.0,1,-0.2659197918000082,0.21601208459214502,0.059320659210062375,-0.5988444469664678,0.5093243656374198,0.6494882472052341,0.0,0.0,0.0,0.0,
-2,2021.0,1,-0.25543875103684177,0.16545796400752083,0.0570746110314559,-0.5821259283872153,0.45847217856020117,0.6444373367775469,0.0,0.0,0.0,0.0,
-2,2022.0,1,-0.24930347300809638,0.17013333333333333,0.05798520015481514,-0.584760268520426,0.42144108081060794,0.6442540414107724,0.0,0.0,0.0,0.0,
\ No newline at end of file
+2,2020.0,1,-0.2659197918000082,0.2158490566037736,0.059320659210062375,-0.5988444469664678,0.5075868820362213,0.6494882472052341,0.0,0.0,0.0,0.0,
+2,2021.0,1,-0.25543875103684177,0.1670235546038544,0.0570746110314559,-0.5821259283872153,0.45493400377121307,0.6444373367775469,0.0,0.0,0.0,0.0,
+2,2022.0,1,-0.24930347300809638,0.16631186801490155,0.05798520015481514,-0.584760268520426,0.42149276085871196,0.6442540414107724,0.0,0.0,0.0,0.0,
\ No newline at end of file