diff --git a/archetypes.py b/archetypes.py
index 47efb56..f8c6e00 100644
--- a/archetypes.py
+++ b/archetypes.py
@@ -8,6 +8,7 @@ import configuration as c
 
 print('start archetypes')
 
+
 def process_formula(formula, hdd):
   formula = formula.replace('( hdd < ', '').replace(') ', '').split(':')
   for equation in formula:
@@ -48,17 +49,39 @@ for standard in standards['standard']:
       archetype["average_storey_height"] = 3.5
       if "Apartment" in function:
         archetype["average_storey_height"] = 3.0
-      archetype["thermal_capacity"] = 200
-      archetype["extra_loses_due_thermal_bridges"] = 0.05
-      if period == '1000_1979':
-        archetype["thermal_capacity"] = 300
-        archetype["extra_loses_due_thermal_bridges"] = 0.1
+      archetype["thermal_capacity"] = 300
+      archetype["extra_loses_due_thermal_bridges"] = 0.1
+      if period == '1981_1990' or period == '1991_2000' or period == '2001_2010' or period == '2011_2016' \
+          or period == '2017_2019' or period == '2020_3000':
+        archetype["thermal_capacity"] = 200
+        archetype["extra_loses_due_thermal_bridges"] = 0.05
+
       archetype["infiltration_rate_for_ventilation_system_on"] = 0
-      archetype["infiltration_rate_for_ventilation_system_off"] = 0.3
-      if period == '1000_1979':
-        archetype["infiltration_rate_for_ventilation_system_off"] = 1.8
-      elif period == '1980_2010':
-        archetype["infiltration_rate_for_ventilation_system_off"] = 1.0
+      archetype["infiltration_rate_for_ventilation_system_off"] = 0.31
+      if period == '1000_1900':
+        archetype["infiltration_rate_for_ventilation_system_off"] = 1.11
+      elif period == '1901_1910':
+          archetype["infiltration_rate_for_ventilation_system_off"] = 1.13
+      elif period == '1911_1920':
+        archetype["infiltration_rate_for_ventilation_system_off"] = 1.15
+      elif period == '1921_1930':
+        archetype["infiltration_rate_for_ventilation_system_off"] = 1.10
+      elif period == '1931_1940':
+        archetype["infiltration_rate_for_ventilation_system_off"] = 1.05
+      elif period == '1941_1950':
+        archetype["infiltration_rate_for_ventilation_system_off"] = 0.88
+      elif period == '1951_1960':
+        archetype["infiltration_rate_for_ventilation_system_off"] = 0.87
+      elif period == '1961_1970':
+        archetype["infiltration_rate_for_ventilation_system_off"] = 0.79
+      elif period == '1971_1980':
+        archetype["infiltration_rate_for_ventilation_system_off"] = 0.70
+      elif period == '1981_1990':
+        archetype["infiltration_rate_for_ventilation_system_off"] = 0.62
+      elif period == '1991_2000':
+        archetype["infiltration_rate_for_ventilation_system_off"] = 0.69
+      elif period == '2001_2010':
+        archetype["infiltration_rate_for_ventilation_system_off"] = 0.61
       count = 10
       window_wall_ratio = {}
       for cell in cells:
diff --git a/configuration.py b/configuration.py
index 3e1cee5..7b7b45f 100644
--- a/configuration.py
+++ b/configuration.py
@@ -70,8 +70,18 @@ surface_types = {
   ]
 }
 
-heavy_light = {'1000_1979': 0,
-               '1980_2010': 1,
+heavy_light = {'1000_1900': 0,
+               '1901_1910': 0,
+               '1911_1920': 0,
+               '1921_1930': 0,
+               '1931_1940': 0,
+               '1941_1950': 0,
+               '1951_1960': 0,
+               '1961_1970': 0,
+               '1971_1980': 0,
+               '1981_1990': 1,
+               '1991_2000': 1,
+               '2001_2010': 1,
                '2011_2016': 1,
                '2017_2019': 1,
                '2020_3000': 1}
diff --git a/data/nrcan.xml b/data/nrcan.xml
index a23eb99..3d247c3 100644
--- a/data/nrcan.xml
+++ b/data/nrcan.xml
@@ -2,13 +2,53 @@
 <nrcan base_url_archetypes="https://raw.githubusercontent.com/canmet-energy/necb-2011-baselines/master/output/"
        base_url_construction="https://raw.githubusercontent.com/NREL/openstudio-standards/master/lib/openstudio-standards/standards/necb/">
     <standards_per_period>
-        <standard period_of_construction="1000_1979">
+        <standard period_of_construction="1000_1900">
             <constructions_location>BTAPPRE1980/data/surface_thermal_transmittance.json</constructions_location>
             
         </standard>
-        <standard period_of_construction="1980_2010">
+        <standard period_of_construction="1901_1910">
+            <constructions_location>BTAPPRE1980/data/surface_thermal_transmittance.json</constructions_location>
+
+        </standard>
+        <standard period_of_construction="1911_1920">
+            <constructions_location>BTAPPRE1980/data/surface_thermal_transmittance.json</constructions_location>
+
+        </standard>
+        <standard period_of_construction="1921_1930">
+            <constructions_location>BTAPPRE1980/data/surface_thermal_transmittance.json</constructions_location>
+
+        </standard>
+        <standard period_of_construction="1931_1940">
+            <constructions_location>BTAPPRE1980/data/surface_thermal_transmittance.json</constructions_location>
+
+        </standard>
+        <standard period_of_construction="1941_1950">
+            <constructions_location>BTAPPRE1980/data/surface_thermal_transmittance.json</constructions_location>
+
+        </standard>
+        <standard period_of_construction="1951_1960">
+            <constructions_location>BTAPPRE1980/data/surface_thermal_transmittance.json</constructions_location>
+
+        </standard>
+        <standard period_of_construction="1961_1970">
+            <constructions_location>BTAPPRE1980/data/surface_thermal_transmittance.json</constructions_location>
+
+        </standard>
+        <standard period_of_construction="1971_1980">
+            <constructions_location>BTAPPRE1980/data/surface_thermal_transmittance.json</constructions_location>
+
+        </standard>
+        <standard period_of_construction="1981_1990">
             <constructions_location>BTAP1980TO2010/data/surface_thermal_transmittance.json</constructions_location>
            
+        </standard>
+        <standard period_of_construction="1991_2000">
+            <constructions_location>BTAP1980TO2010/data/surface_thermal_transmittance.json</constructions_location>
+
+        </standard>
+        <standard period_of_construction="2001_2010">
+            <constructions_location>BTAP1980TO2010/data/surface_thermal_transmittance.json</constructions_location>
+
         </standard>
         <standard period_of_construction="2011_2016">
             <constructions_location>NECB2011/data/surface_thermal_transmittance.json</constructions_location>