Passing YEAR_WITHIN correctly to Simulation now