diff --git a/conf/EI_configuration.csv b/conf/EI_configuration.csv
index 2d33a264e3341b27ac46a24a79970d8664eaac22..e885b76c84803231d2075cf6622abc5d018156b2 100644
--- a/conf/EI_configuration.csv
+++ b/conf/EI_configuration.csv
@@ -1,98 +1,98 @@
-ei;sector;ref_year;active;factor_mask;regrid_mask;pollutants;path;frequency;source_type;p_vertical;p_month;p_day;p_hour;p_speciation;comment
+ei;sector;ref_year;active;factor_mask;regrid_mask;pollutants;path;frequency;source_type;p_vertical;p_month;p_week;p_hour;p_speciation;comment
 GFASv12;;2015;1;;;co,nox_no,pm25,oc,bc,so2,ch3oh,c2h5oh,c3h8,c2h4,c3h6,c5h8,terpenes,hialkenes,hialkanes,ch2o,c2h4o,c3h6o,nh3,c2h6s,c2h6,c7h8,c6h6,c8h10,c4h8,c5h10,c6h12,c8h16,c4h10,c5h12,c6h14,c7h16;<data_path>/ecmwf/gfas/daily_mean;daily;point;method=sovief,approach=uniform;;;H001;E001;
-HTAPv2;energy;2010;1;;;co,nox_no2,pm10,pm25,oc,bc,so2,nh3,voc01,voc02,voc03,voc04,voc05,voc06,voc07,voc08,voc09,voc12,voc13,voc14,voc15,voc16,voc17,voc21,voc22,voc23,voc24;<data_path>/jrc/htapv2/monthly_mean;monthly;area;V001;;D002;H002;E002;
-HTAPv2;industry;2010;1;;;co,nox_no2,pm10,pm25,oc,bc,so2,nh3,voc01,voc02,voc03,voc04,voc05,voc06,voc07,voc08,voc09,voc12,voc13,voc14,voc15,voc16,voc17,voc18,voc19,voc20,voc21,voc22,voc23,voc24;<data_path>/jrc/htapv2/monthly_mean;monthly;area;V002;;D003;H004;E003;
-HTAPv2;residential;2010;1;;;co,nox_no2,pm10,pm25,oc,bc,so2,nh3,voc01,voc02,voc03,voc04,voc05,voc06,voc07,voc08,voc09,voc12,voc13,voc14,voc15,voc16,voc17,voc19,voc21,voc22,voc23,voc24;<data_path>/jrc/htapv2/monthly_mean;monthly;area;;;D003;H003;E004;
-HTAPv2;transport;2010;1;;;co,nox_no2,pm10,pm25,oc,bc,so2,nh3,voc02,voc03,voc04,voc05,voc06,voc07,voc08,voc09,voc12,voc13,voc14,voc15,voc16,voc17,voc21,voc22,voc23;<data_path>/jrc/htapv2/monthly_mean;monthly;area;;;D005;weekday=H006, saturday=H009, sunday=H010;E005;
-HTAPv2;agriculture;2010;1;;;nh3;<data_path>/jrc/htapv2/monthly_mean;monthly;area;;;D001;H007;E006;
-HTAPv2;air_lto;2010;1;;;co,nox_no2,pm10,pm25,oc,bc,so2,voc02,voc03,voc05,voc06,voc07,voc08,voc09,voc12,voc13,voc14,voc15,voc17,voc21,voc22,voc23;<data_path>/jrc/htapv2/yearly_mean;yearly;area;V003;M001;D001;H001;E007;
-HTAPv2;air_cds;2010;1;;;co,nox_no2,pm10,pm25,oc,bc,so2,voc02,voc03,voc05,voc06,voc07,voc08,voc09,voc12,voc13,voc14,voc15,voc17,voc21,voc22,voc23;<data_path>/jrc/htapv2/yearly_mean;yearly;area;V004;M001;D001;H001;E007;
-HTAPv2;air_crs;2010;1;;;co,nox_no2,pm10,pm25,oc,bc,so2,voc02,voc03,voc05,voc06,voc07,voc08,voc09,voc12,voc13,voc14,voc15,voc17,voc21,voc22,voc23;<data_path>/jrc/htapv2/yearly_mean;yearly;area;V005;M001;D001;H001;E007;
-HTAPv2;ships;2010;1;;;co,nox_no2,pm10,pm25,oc,bc,so2,voc01,voc02,voc03,voc04,voc05,voc06,voc07,voc08,voc09,voc12,voc13,voc14,voc15,voc16,voc17,voc18,voc19,voc21,voc22,voc23,voc24;<data_path>/jrc/htapv2/yearly_mean;yearly;area;;M001;D001;H001;E008;
-wiedinmyer;;2010;1;;;bc,c2h2,c2h4,c3h6,c6h6,ch2o,ch3cooh,ch3oh,co,hcl,nh3,nox_no,oc,pm10,pm25,so2;<data_path>/ucar/wiedinmyer/yearly_mean;yearly;area;;M001;D001;H008;E009;
-TNO_MACC-III;snap1;2011;0;;;co,nox_no2,so2,nh3,pm10,pm25,voc01,voc02,voc03,voc04,voc05,voc06,voc07,voc08,voc09,voc12,voc13,voc14,voc15,voc16,voc17,voc19,voc21,voc22,voc23,voc24;<data_path>/tno/tno_macc_iii/yearly_mean/;yearly;area;V001;M002;D002;H002;E010;
-TNO_MACC-III;snap2;2011;0;;;co,nox_no2,so2,nh3,pm10,pm25,voc01,voc02,voc03,voc04,voc05,voc06,voc07,voc08,voc09,voc12,voc13,voc14,voc15,voc16,voc17,voc19,voc21,voc22,voc23,voc24;<data_path>/tno/tno_macc_iii/yearly_mean/;yearly;area;;M003;D003;H003;E011;
-TNO_MACC-III;snap34;2011;0;;;co,nox_no2,so2,nh3,pm10,pm25,voc01,voc02,voc03,voc04,voc05,voc06,voc07,voc08,voc09,voc12,voc13,voc14,voc15,voc16,voc17,voc19,voc21,voc22,voc23,voc24;<data_path>/tno/tno_macc_iii/yearly_mean/;yearly;area;V002;M004;D003;H004;E012;
-TNO_MACC-III;snap5;2011;0;;;co,nox_no2,so2,nh3,pm10,pm25,voc02,voc03,voc04,voc05,voc06,voc12,voc13,voc14,voc15;<data_path>/tno/tno_macc_iii/yearly_mean/;yearly;area;;M005;D001;H001;E013;
-TNO_MACC-III;snap6;2011;0;;;co,nox_no2,so2,nh3,pm10,pm25,voc01,voc06,voc14,voc15,voc17,voc18,voc19,voc20,voc23;<data_path>/tno/tno_macc_iii/yearly_mean/;yearly;area;;M006;D004;H005;E014;
-TNO_MACC-III;snap71;2011;0;;;co,nox_no2,so2,nh3,pm10,pm25,voc02,voc03,voc04,voc05,voc06,voc07,voc08,voc09,voc12,voc13,voc14,voc15,voc16,voc17,voc21,voc22,voc23;<data_path>/tno/tno_macc_iii/yearly_mean/;yearly;area;;M007;D005;weekday=H006, saturday=H009, sunday=H010;E015;
-TNO_MACC-III;snap72;2011;0;;;co,nox_no2,so2,nh3,pm10,pm25,voc02,voc03,voc04,voc05,voc06,voc07,voc08,voc09,voc12,voc13,voc14,voc15,voc17,voc21,voc22,voc23;<data_path>/tno/tno_macc_iii/yearly_mean/;yearly;area;;M007;D005;weekday=H006, saturday=H009, sunday=H010;E016;
-TNO_MACC-III;snap73;2011;0;;;co,nox_no2,so2,nh3,pm10,pm25,voc02,voc03,voc07,voc08,voc12,voc17,voc21,voc22;<data_path>/tno/tno_macc_iii/yearly_mean/;yearly;area;;M007;D005;weekday=H006, saturday=H009, sunday=H010;E017;
-TNO_MACC-III;snap74;2011;0;;;voc03,voc04,voc05,voc06,voc12,voc13,voc14,voc15;<data_path>/tno/tno_macc_iii/yearly_mean/;yearly;area;;M007;D005;weekday=H006, saturday=H009, sunday=H010;E018;
-TNO_MACC-III;snap75;2011;0;;;pm10,pm25;<data_path>/tno/tno_macc_iii/yearly_mean/;yearly;area;;M007;D005;weekday=H006, saturday=H009, sunday=H010;E019;
-TNO_MACC-III;snap8;2011;0;;;co,nox_no2,so2,nh3,pm10,pm25,voc01,voc02,voc03,voc04,voc05,voc06,voc07,voc08,voc09,voc12,voc13,voc14,voc15,voc16,voc17,voc21,voc22,voc23,voc24;<data_path>/tno/tno_macc_iii/yearly_mean/;yearly;area;;M008;D001;H001;E020;
-TNO_MACC-III;snap9;2011;0;;;co,nox_no2,so2,nh3,pm10,pm25,voc01,voc02,voc03,voc04,voc05,voc06,voc07,voc08,voc09,voc12,voc13,voc14,voc15,voc16,voc17,voc18,voc19,voc20,voc21,voc22,voc23,voc24;<data_path>/tno/tno_macc_iii/yearly_mean/;yearly;area;;M001;D001;H001;E021;
-TNO_MACC-III;snap10;2011;0;;;co,nox_no2,so2,nh3,pm10,pm25;<data_path>/tno/tno_macc_iii/yearly_mean/;yearly;area;;M009;D001;H007;E022;
-ECLIPSEv5a;agriculture;2010;0;;;pm10,pm25,nh3;<data_path>/iiasa/eclipsev5a/monthly_mean;monthly;area;;;D001;H007;E023;
-ECLIPSEv5a;flaring;2010;0;;;co,nox_no2,nh3,pm10,pm25,oc,bc,so2,nmvoc;<data_path>/iiasa/eclipsev5a/yearly_mean;yearly;area;V006;M001;D001;H001;E024;
-ECLIPSEv5a;energy;2010;0;;;co,nox_no2,nh3,pm10,pm25,oc,bc,so2,nmvoc;<data_path>/iiasa/eclipsev5a/monthly_mean;monthly;area;V001;;D002;H002;E025;
-ECLIPSEv5a;industry;2010;0;;;co,nox_no2,nh3,pm10,pm25,oc,bc,so2,nmvoc;<data_path>/iiasa/eclipsev5a/monthly_mean;monthly;area;V002;;D003;H004;E026;
-ECLIPSEv5a;transport;2010;0;;;co,nox_no2,nh3,pm10,pm25,oc,bc,so2,nmvoc;<data_path>/iiasa/eclipsev5a/monthly_mean;monthly;area;;;D005;weekday=H006, saturday=H009, sunday=H010;E027;
-ECLIPSEv5a;residential;2010;0;;;co,nox_no2,nh3,pm10,pm25,oc,bc,so2,nmvoc;<data_path>/iiasa/eclipsev5a/monthly_mean;monthly;area;;;D003;H003;E028;
-ECLIPSEv5a;waste;2010;0;;;co,nox_no2,nh3,pm10,pm25,oc,bc,so2,nmvoc;<data_path>/iiasa/eclipsev5a/monthly_mean;monthly;area;;;D001;H001;E029;
-ECLIPSEv5.a;solvent;2010;0;;;nmvoc;<data_path>/iiasa/eclipsev5a/monthly_mean;monthly;area;;M006;D004;H005;E030;
-ECLIPSEv5a;agricultural_waste;2010;0;;;co,nox_no2,nh3,pm10,pm25,oc,bc,so2,nmvoc;<data_path>/iiasa/eclipsev5a/monthly_mean;monthly;area;;;D001;H007;E031;
-ECLIPSEv5a;ships;2010;0;;;co,nox_no2,pm10,pm25,oc,bc,so2,nmvoc;<data_path>/iiasa/eclipsev5a/yearly_mean;yearly;area;;M001;D001;H001;E032;
-EDGARv432_AP;ags;2010;0;;;nox_no2,nh3,pm10,pm25_fossil;<data_path>/jrc/edgarv432_ap/monthly_mean;monthly;area;;;D001;H007;E033;
-EDGARv432_AP;awb;2010;0;;;nox_no2,co,so2,nh3,nmvoc,pm10,bc,oc,pm25_bio;<data_path>/jrc/edgarv432_ap/monthly_mean;monthly;area;;;D001;H007;E034;
-EDGARv432_AP;che;2010;0;;;nox_no2,co,so2,nh3,nmvoc,pm10,bc,pm25_fossil;<data_path>/jrc/edgarv432_ap/monthly_mean;monthly;area;V002;;D003;H004;E035;
-EDGARv432_AP;ene;2010;0;;;nox_no2,co,so2,nh3,nmvoc,pm10,bc,oc,pm25_bio,pm25_fossil;<data_path>/jrc/edgarv432_ap/monthly_mean;monthly;area;V001;;D002;H002;E036;
-EDGARv432_AP;foo_pap;2010;0;;;nox_no2,co,so2,nmvoc,pm10,bc,pm25_fossil;<data_path>/jrc/edgarv432_ap/monthly_mean;monthly;area;V002;;D003;H004;E037;
-EDGARv432_AP;fff;2010;0;;;nox_no2,co,so2,nmvoc,pm10,bc,oc,pm25_fossil;<data_path>/jrc/edgarv432_ap/monthly_mean;monthly;area;V006;;D001;H001;E038;
-EDGARv432_AP;ind;2010;0;;;nox_no2,co,so2,nh3,nmvoc,pm10,bc,oc,pm25_bio,pm25_fossil;<data_path>/jrc/edgarv432_ap/monthly_mean;monthly;area;V002;;D003;H004;E039;
-EDGARv432_AP;iro;2010;0;;;nox_no2,co,so2,nmvoc,pm10,bc,pm25_fossil;<data_path>/jrc/edgarv432_ap/monthly_mean;monthly;area;V002;;D003;H004;E040;
-EDGARv432_AP;mnm;2010;0;;;nox_no2,nh3,pm10,pm25_fossil;<data_path>/jrc/edgarv432_ap/monthly_mean;monthly;area;;;D001;H007;E041;
-EDGARv432_AP;neu;2010;0;;;pm10;<data_path>/jrc/edgarv432_ap/monthly_mean;monthly;area;;;D001;H001;E042;
-EDGARv432_AP;nfe;2010;0;;;nox_no2,co,so2,pm10,bc,pm25_fossil;<data_path>/jrc/edgarv432_ap/monthly_mean;monthly;area;V002;;D003;H004;E043;
-EDGARv432_AP;nmm;2010;0;;;co,so2,nh3,nmvoc,pm10,bc,pm25_fossil;<data_path>/jrc/edgarv432_ap/monthly_mean;monthly;area;V002;;D003;H004;E044;
-EDGARv432_AP;pro;2010;0;;;nox_no2,co,so2,nmvoc,pm10,bc,oc,pm25_fossil;<data_path>/jrc/edgarv432_ap/monthly_mean;monthly;area;;;D001;H001;E045;
-EDGARv432_AP;pru_sol;2010;0;;;nh3,nmvoc,pm10,pm25_fossil;<data_path>/jrc/edgarv432_ap/monthly_mean;monthly;area;;;D004;H005;E046;
-EDGARv432_AP;rco;2010;0;;;nox_no2,co,so2,nh3,nmvoc,pm10,bc,oc,pm25_bio,pm25_fossil;<data_path>/jrc/edgarv432_ap/monthly_mean;monthly;area;;;D003;H003;E047;
-EDGARv432_AP;ref_trf;2010;0;;;nox_no2,co,so2,nh3,nmvoc,pm10,bc,oc,pm25_bio,pm25_fossil;<data_path>/jrc/edgarv432_ap/monthly_mean;monthly;area;V006;;D001;H001;E048;
-EDGARv432_AP;swd_inc;2010;0;;;nox_no2,co,so2,nh3,nmvoc,pm10,bc,oc,pm25_bio,pm25_fossil;<data_path>/jrc/edgarv432_ap/monthly_mean;monthly;area;V006;;D001;H001;E049;
-EDGARv432_AP;swd_ldf;2010;0;;;nh3,nmvoc,pm10,pm25_fossil;<data_path>/jrc/edgarv432_ap/monthly_mean;monthly;area;;;D001;H001;E050;
-EDGARv432_AP;tnr_aviation_cds;2010;0;;;nox_no2,co,so2,nmvoc,pm10,bc,oc,pm25_fossil;<data_path>/jrc/edgarv432_ap/monthly_mean;monthly;area;V004;;D001;H001;E051;
-EDGARv432_AP;tnr_aviation_crs;2010;0;;;nox_no2,co,so2,nmvoc,pm10,bc,oc,pm25_fossil;<data_path>/jrc/edgarv432_ap/monthly_mean;monthly;area;V005;;D001;H001;E052;
-EDGARv432_AP;tnr_aviation_lto;2010;0;;;nox_no2,co,so2,nmvoc,pm10,bc,oc,pm25_fossil;<data_path>/jrc/edgarv432_ap/monthly_mean;monthly;area;V003;;D001;H001;E053;
-EDGARv432_AP;tnr_other;2010;0;;;nox_no2,co,so2,nh3,nmvoc,pm10,bc,oc,pm25_bio,pm25_fossil;<data_path>/jrc/edgarv432_ap/monthly_mean;monthly;area;;;D001;H001;E054;
-EDGARv432_AP;tnr_ship;2010;0;;;nox_no2,co,so2,nh3,nmvoc,pm10,bc,oc,pm25_bio,pm25_fossil;<data_path>/jrc/edgarv432_ap/monthly_mean;monthly;area;;;D001;H001;E055;
-EDGARv432_AP;tro;2010;0;;;nox_no2,co,so2,nh3,nmvoc,pm10,bc,oc,pm25_bio,pm25_fossil;<data_path>/jrc/edgarv432_ap/monthly_mean;monthly;area;;;D005;weekday=H006, saturday=H009, sunday=H010;E056;
-EDGARv432_AP;wwt;2010;0;;;nh3,nmvoc;<data_path>/jrc/edgarv432_ap/monthly_mean;monthly;area;;;D001;H001;E057;
-EDGARv432_VOC;awb;2010;0;;;voc2,voc3,voc4,voc5,voc6,voc7,voc8,voc9,voc10,voc11,voc12,voc13,voc14,voc15,voc16,voc17,voc19,voc21,voc22,voc23;<data_path>/jrc/edgarv432_voc/monthly_mean;monthly;area;;;D001;H007;E058;
-EDGARv432_VOC;ene;2010;0;;;voc1,voc2,voc3,voc4,voc5,voc6,voc7,voc8,voc9,voc10,voc11,voc12,voc13,voc14,voc15,voc16,voc17,voc18,voc19,voc20,voc21,voc22,voc23,voc24;<data_path>/jrc/edgarv432_voc/monthly_mean;monthly;area;V001;;D002;H002;E059;
-EDGARv432_VOC;fff;2010;0;;;voc2,voc3,voc4,voc5,voc6,voc8,voc10,voc12,voc13,voc14,voc15,voc17,voc18,voc19,voc20;<data_path>/jrc/edgarv432_voc/monthly_mean;monthly;area;V006;;D001;H001;E060;
-EDGARv432_VOC;ind;2010;0;;;voc1,voc2,voc3,voc4,voc5,voc6,voc7,voc8,voc9,voc10,voc11,voc12,voc13,voc14,voc15,voc16,voc17,voc18,voc19,voc20,voc21,voc22,voc23,voc24;<data_path>/jrc/edgarv432_voc/monthly_mean;monthly;area;V002;;D003;H004;E061;
-EDGARv432_VOC;ppa;2010;0;;;voc1,voc2,voc3,voc4,voc5,voc6,voc7,voc8,voc9,voc10,voc11,voc12,voc13,voc14,voc15,voc16,voc17,voc18,voc19,voc20,voc21,voc22,voc23,voc24;<data_path>/jrc/edgarv432_voc/monthly_mean;monthly;area;;;D001;H001;E062;
-EDGARv432_VOC;pro;2010;0;;;voc2,voc3,voc4,voc5,voc6,voc7,voc8,voc9,voc10,voc12,voc13,voc14,voc15,voc16,voc17,voc18,voc19,voc20,voc21,voc22,voc23;<data_path>/jrc/edgarv432_voc/monthly_mean;monthly;area;;;D001;H001;E063;
-EDGARv432_VOC;rco;2010;0;;;voc1,voc2,voc3,voc4,voc5,voc6,voc7,voc8,voc9,voc10,voc11,voc12,voc13,voc14,voc15,voc16,voc17,voc18,voc19,voc20,voc21,voc22,voc23,voc24;<data_path>/jrc/edgarv432_voc/monthly_mean;monthly;area;;;D003;H003;E064;
-EDGARv432_VOC;ref;2010;0;;;voc1,voc2,voc3,voc4,voc5,voc6,voc7,voc8,voc9,voc10,voc12,voc13,voc14,voc15,voc16,voc17,voc23;<data_path>/jrc/edgarv432_voc/monthly_mean;monthly;area;V006;;D003;H004;E065;
-EDGARv432_VOC;swd;2010;0;;;voc1,voc2,voc3,voc4,voc5,voc6,voc7,voc8,voc9,voc10,voc11,voc12,voc13,voc14,voc15,voc17,voc18,voc19,voc21,voc22,voc23,voc24;<data_path>/jrc/edgarv432_voc/monthly_mean;monthly;area;;;D001;H001;E066;
-EDGARv432_VOC;tnr_aviation_cds;2010;0;;;voc1,voc2,voc3,voc5,voc6,voc7,voc8,voc9,voc12,voc13,voc14,voc15,voc16,voc17,voc21,voc22,voc23;<data_path>/jrc/edgarv432_voc/monthly_mean;monthly;area;V004;;D001;H001;E067;
-EDGARv432_VOC;tnr_aviation_crs;2010;0;;;voc1,voc2,voc3,voc5,voc6,voc7,voc8,voc9,voc12,voc13,voc14,voc15,voc16,voc17,voc21,voc22,voc23;<data_path>/jrc/edgarv432_voc/monthly_mean;monthly;area;V005;;D001;H001;E068;
-EDGARv432_VOC;tnr_aviation_lto;2010;0;;;voc1,voc2,voc3,voc5,voc6,voc7,voc8,voc9,voc12,voc13,voc14,voc15,voc16,voc17,voc21,voc22,voc23;<data_path>/jrc/edgarv432_voc/monthly_mean;monthly;area;V003;;D001;H001;E069;
-EDGARv432_VOC;tnr_other;2010;0;;;voc1,voc2,voc3,voc4,voc5,voc6,voc7,voc8,voc9,voc10,voc11,voc12,voc13,voc14,voc15,voc16,voc17,voc18,voc19,voc20,voc21,voc22,voc23,voc24;<data_path>/jrc/edgarv432_voc/monthly_mean;monthly;area;;;D001;H001;E070;
-EDGARv432_VOC;tnr_ship;2010;0;;;voc1,voc2,voc3,voc4,voc5,voc6,voc7,voc8,voc9,voc10,voc11,voc12,voc13,voc14,voc15,voc16,voc17,voc18,voc19,voc20,voc21,voc22,voc23,voc24;<data_path>/jrc/edgarv432_voc/monthly_mean;monthly;area;;;D001;H001;E071;
-EDGARv432_VOC;trf;2010;0;;;voc1,voc2,voc3,voc4,voc5,voc6,voc7,voc8,voc9,voc10,voc11,voc12,voc13,voc14,voc15,voc16,voc17,voc18,voc19,voc20,voc21,voc22,voc23,voc24;<data_path>/jrc/edgarv432_voc/monthly_mean;monthly;area;;;D001;H001;E072;
-EDGARv432_VOC;tro;2010;0;;;voc1,voc2,voc3,voc4,voc5,voc6,voc7,voc8,voc9,voc10,voc11,voc12,voc13,voc14,voc15,voc16,voc17,voc18,voc19,voc20,voc21,voc22,voc23,voc24;<data_path>/jrc/edgarv432_voc/monthly_mean;monthly;area;;;D005;weekday=H006, saturday=H009, sunday=H010;E073;
-EMEP;a_publicpower;2015;0;;;co,nox_no2,pm10,pm25,so2,nmvoc,nh3;<data_path>/ceip/emepv18/yearly_mean;yearly;area;V001;M002;D002;H002;E074;
-EMEP;b_industry;2015;0;;;co,nox_no2,pm10,pm25,so2,nmvoc,nh3;<data_path>/ceip/emepv18/yearly_mean;yearly;area;V002;M004;D003;H004;E075;
-EMEP;c_otherstationarycomb;2015;0;;;co,nox_no2,pm10,pm25,so2,nmvoc,nh3;<data_path>/ceip/emepv18/yearly_mean;yearly;area;;M003;D003;H003;E076;
-EMEP;d_fugitive;2015;0;;;co,nox_no2,pm10,pm25,so2,nmvoc,nh3;<data_path>/ceip/emepv18/yearly_mean;yearly;area;;M005;D001;H001;E077;
-EMEP;e_solvents;2015;0;;;co,nox_no2,pm10,pm25,so2,nmvoc,nh3;<data_path>/ceip/emepv18/yearly_mean;yearly;area;;M006;D004;H005;E078;
-EMEP;f_roadtransport;2015;0;;;co,nox_no2,pm10,pm25,so2,nmvoc,nh3;<data_path>/ceip/emepv18/yearly_mean;yearly;area;;M007;D005;weekday=H006, saturday=H009, sunday=H010;E079;
-EMEP;g_shipping;2015;0;;;co,nox_no2,pm10,pm25,so2,nmvoc,nh3;<data_path>/ceip/emepv18/yearly_mean;yearly;area;;M001;D001;H001;E080;
-EMEP;h_aviation;2015;0;;;co,nox_no2,pm10,pm25,so2,nmvoc,nh3;<data_path>/ceip/emepv18/yearly_mean;yearly;area;V003;M001;D001;H001;E081;
-EMEP;i_offroad;2015;0;;;co,nox_no2,pm10,pm25,so2,nmvoc,nh3;<data_path>/ceip/emepv18/yearly_mean;yearly;area;;M001;D001;H001;E082;
-EMEP;j_waste;2015;0;;;co,nox_no2,pm10,pm25,so2,nmvoc,nh3;<data_path>/ceip/emepv18/yearly_mean;yearly;area;;M001;D001;H001;E083;
-EMEP;k_agrilivestock;2015;0;;;co,nox_no2,pm10,pm25,so2,nmvoc,nh3;<data_path>/ceip/emepv18/yearly_mean;yearly;area;;M009;D001;H007;E084;
-EMEP;l_agriother;2015;0;;;co,nox_no2,pm10,pm25,so2,nmvoc,nh3;<data_path>/ceip/emepv18/yearly_mean;yearly;area;;M009;D001;H007;E085;
-carn;;2015;1;;;so2;<data_path>/mtu/carnetal/yearly_mean;yearly;point;;M001;D001;H001;E086;
-CEDS;agriculture;2014;0;;;nox_no2,nh3;<data_path>/jgcri/ceds/monthly_mean;monthly;area;;;D001;H007;E087;
-CEDS;energy;2014;0;;;co,nox_no2,oc,bc,so2,nh3,voc01,voc02,voc03,voc04,voc05,voc06,voc07,voc08,voc09,voc12,voc13,voc14,voc15,voc16,voc17,voc18,voc19,voc20,voc21,voc22,voc23,voc24;<data_path>/jgcri/ceds/monthly_mean;monthly;area;V001;;D002;H002;E088;
-CEDS;industrial;2014;0;;;co,nox_no2,oc,bc,so2,nh3,voc01,voc02,voc03,voc04,voc05,voc06,voc07,voc08,voc09,voc12,voc13,voc14,voc15,voc16,voc17,voc18,voc19,voc20,voc21,voc22,voc23,voc24;<data_path>/jgcri/ceds/monthly_mean;monthly;area;V002;;D003;H004;E089;
-CEDS;transportation;2014;0;;;co,nox_no2,oc,bc,so2,nh3,voc01,voc02,voc03,voc04,voc05,voc06,voc07,voc08,voc09,voc12,voc13,voc14,voc15,voc16,voc17,voc18,voc19,voc20,voc21,voc22,voc23,voc24;<data_path>/jgcri/ceds/monthly_mean;monthly;area;;;D005;weekday=H006, saturday=H009, sunday=H010;E090;
-CEDS;residential;2014;0;;;co,nox_no2,oc,bc,so2,nh3,voc01,voc02,voc03,voc04,voc05,voc06,voc07,voc08,voc09,voc12,voc13,voc14,voc15,voc16,voc17,voc18,voc19,voc20,voc21,voc22,voc23,voc24;<data_path>/jgcri/ceds/monthly_mean;monthly;area;;;D003;H003;E091;
-CEDS;solvent;2014;0;;;voc1,voc2,voc3,voc4,voc5,voc6,voc7,voc8,voc9,voc12,voc13,voc14,voc15,voc16,voc17,voc18,voc19,voc20,voc21,voc22,voc23,voc24;<data_path>/jgcri/ceds/monthly_mean;monthly;area;;;D004;H005;E092;
-CEDS;waste;2014;0;;;co,nox_no2,oc,bc,so2,nh3,voc01,voc02,voc03,voc04,voc05,voc06,voc07,voc08,voc09,voc12,voc13,voc14,voc15,voc16,voc17,voc18,voc19,voc20,voc21,voc22,voc23,voc24;<data_path>/jgcri/ceds/monthly_mean;monthly;area;;;D001;H001;E093;
-CEDS;shipping;2014;0;;;co,nox_no2,oc,bc,so2,nh3,voc01,voc02,voc03,voc04,voc05,voc06,voc07,voc08,voc09,voc12,voc13,voc14,voc15,voc16,voc17,voc18,voc19,voc20,voc21,voc22,voc23,voc24;<data_path>/jgcri/ceds/monthly_mean;monthly;area;;;D001;H001;E094;
-CEDS;air;2014;0;;;co,nox_no2,oc,bc,so2,nh3,nmvoc;<data_path>/jgcri/ceds/monthly_mean;monthly;area;;;D001;H001;E095;
\ No newline at end of file
+HTAPv2;energy;2010;1;;;co,nox_no2,pm10,pm25,oc,bc,so2,nh3,voc01,voc02,voc03,voc04,voc05,voc06,voc07,voc08,voc09,voc12,voc13,voc14,voc15,voc16,voc17,voc21,voc22,voc23,voc24;<data_path>/jrc/htapv2/monthly_mean;monthly;area;V001;;W002;H002;E002;
+HTAPv2;industry;2010;1;;;co,nox_no2,pm10,pm25,oc,bc,so2,nh3,voc01,voc02,voc03,voc04,voc05,voc06,voc07,voc08,voc09,voc12,voc13,voc14,voc15,voc16,voc17,voc18,voc19,voc20,voc21,voc22,voc23,voc24;<data_path>/jrc/htapv2/monthly_mean;monthly;area;V002;;W003;H004;E003;
+HTAPv2;residential;2010;1;;;co,nox_no2,pm10,pm25,oc,bc,so2,nh3,voc01,voc02,voc03,voc04,voc05,voc06,voc07,voc08,voc09,voc12,voc13,voc14,voc15,voc16,voc17,voc19,voc21,voc22,voc23,voc24;<data_path>/jrc/htapv2/monthly_mean;monthly;area;;;W003;H003;E004;
+HTAPv2;transport;2010;1;;;co,nox_no2,pm10,pm25,oc,bc,so2,nh3,voc02,voc03,voc04,voc05,voc06,voc07,voc08,voc09,voc12,voc13,voc14,voc15,voc16,voc17,voc21,voc22,voc23;<data_path>/jrc/htapv2/monthly_mean;monthly;area;;;W005;weekday=H006, saturday=H009, sunday=H010;E005;
+HTAPv2;agriculture;2010;1;;;nh3;<data_path>/jrc/htapv2/monthly_mean;monthly;area;;;W001;H007;E006;
+HTAPv2;air_lto;2010;1;;;co,nox_no2,pm10,pm25,oc,bc,so2,voc02,voc03,voc05,voc06,voc07,voc08,voc09,voc12,voc13,voc14,voc15,voc17,voc21,voc22,voc23;<data_path>/jrc/htapv2/yearly_mean;yearly;area;V003;M001;W001;H001;E007;
+HTAPv2;air_cds;2010;1;;;co,nox_no2,pm10,pm25,oc,bc,so2,voc02,voc03,voc05,voc06,voc07,voc08,voc09,voc12,voc13,voc14,voc15,voc17,voc21,voc22,voc23;<data_path>/jrc/htapv2/yearly_mean;yearly;area;V004;M001;W001;H001;E007;
+HTAPv2;air_crs;2010;1;;;co,nox_no2,pm10,pm25,oc,bc,so2,voc02,voc03,voc05,voc06,voc07,voc08,voc09,voc12,voc13,voc14,voc15,voc17,voc21,voc22,voc23;<data_path>/jrc/htapv2/yearly_mean;yearly;area;V005;M001;W001;H001;E007;
+HTAPv2;ships;2010;1;;;co,nox_no2,pm10,pm25,oc,bc,so2,voc01,voc02,voc03,voc04,voc05,voc06,voc07,voc08,voc09,voc12,voc13,voc14,voc15,voc16,voc17,voc18,voc19,voc21,voc22,voc23,voc24;<data_path>/jrc/htapv2/yearly_mean;yearly;area;;M001;W001;H001;E008;
+wiedinmyer;;2010;1;;;bc,c2h2,c2h4,c3h6,c6h6,ch2o,ch3cooh,ch3oh,co,hcl,nh3,nox_no,oc,pm10,pm25,so2;<data_path>/ucar/wiedinmyer/yearly_mean;yearly;area;;M001;W001;H008;E009;
+TNO_MACC-III;snap1;2011;0;;;co,nox_no2,so2,nh3,pm10,pm25,voc01,voc02,voc03,voc04,voc05,voc06,voc07,voc08,voc09,voc12,voc13,voc14,voc15,voc16,voc17,voc19,voc21,voc22,voc23,voc24;<data_path>/tno/tno_macc_iii/yearly_mean/;yearly;area;V001;M002;W002;H002;E010;
+TNO_MACC-III;snap2;2011;0;;;co,nox_no2,so2,nh3,pm10,pm25,voc01,voc02,voc03,voc04,voc05,voc06,voc07,voc08,voc09,voc12,voc13,voc14,voc15,voc16,voc17,voc19,voc21,voc22,voc23,voc24;<data_path>/tno/tno_macc_iii/yearly_mean/;yearly;area;;M003;W003;H003;E011;
+TNO_MACC-III;snap34;2011;0;;;co,nox_no2,so2,nh3,pm10,pm25,voc01,voc02,voc03,voc04,voc05,voc06,voc07,voc08,voc09,voc12,voc13,voc14,voc15,voc16,voc17,voc19,voc21,voc22,voc23,voc24;<data_path>/tno/tno_macc_iii/yearly_mean/;yearly;area;V002;M004;W003;H004;E012;
+TNO_MACC-III;snap5;2011;0;;;co,nox_no2,so2,nh3,pm10,pm25,voc02,voc03,voc04,voc05,voc06,voc12,voc13,voc14,voc15;<data_path>/tno/tno_macc_iii/yearly_mean/;yearly;area;;M005;W001;H001;E013;
+TNO_MACC-III;snap6;2011;0;;;co,nox_no2,so2,nh3,pm10,pm25,voc01,voc06,voc14,voc15,voc17,voc18,voc19,voc20,voc23;<data_path>/tno/tno_macc_iii/yearly_mean/;yearly;area;;M006;W004;H005;E014;
+TNO_MACC-III;snap71;2011;0;;;co,nox_no2,so2,nh3,pm10,pm25,voc02,voc03,voc04,voc05,voc06,voc07,voc08,voc09,voc12,voc13,voc14,voc15,voc16,voc17,voc21,voc22,voc23;<data_path>/tno/tno_macc_iii/yearly_mean/;yearly;area;;M007;W005;weekday=H006, saturday=H009, sunday=H010;E015;
+TNO_MACC-III;snap72;2011;0;;;co,nox_no2,so2,nh3,pm10,pm25,voc02,voc03,voc04,voc05,voc06,voc07,voc08,voc09,voc12,voc13,voc14,voc15,voc17,voc21,voc22,voc23;<data_path>/tno/tno_macc_iii/yearly_mean/;yearly;area;;M007;W005;weekday=H006, saturday=H009, sunday=H010;E016;
+TNO_MACC-III;snap73;2011;0;;;co,nox_no2,so2,nh3,pm10,pm25,voc02,voc03,voc07,voc08,voc12,voc17,voc21,voc22;<data_path>/tno/tno_macc_iii/yearly_mean/;yearly;area;;M007;W005;weekday=H006, saturday=H009, sunday=H010;E017;
+TNO_MACC-III;snap74;2011;0;;;voc03,voc04,voc05,voc06,voc12,voc13,voc14,voc15;<data_path>/tno/tno_macc_iii/yearly_mean/;yearly;area;;M007;W005;weekday=H006, saturday=H009, sunday=H010;E018;
+TNO_MACC-III;snap75;2011;0;;;pm10,pm25;<data_path>/tno/tno_macc_iii/yearly_mean/;yearly;area;;M007;W005;weekday=H006, saturday=H009, sunday=H010;E019;
+TNO_MACC-III;snap8;2011;0;;;co,nox_no2,so2,nh3,pm10,pm25,voc01,voc02,voc03,voc04,voc05,voc06,voc07,voc08,voc09,voc12,voc13,voc14,voc15,voc16,voc17,voc21,voc22,voc23,voc24;<data_path>/tno/tno_macc_iii/yearly_mean/;yearly;area;;M008;W001;H001;E020;
+TNO_MACC-III;snap9;2011;0;;;co,nox_no2,so2,nh3,pm10,pm25,voc01,voc02,voc03,voc04,voc05,voc06,voc07,voc08,voc09,voc12,voc13,voc14,voc15,voc16,voc17,voc18,voc19,voc20,voc21,voc22,voc23,voc24;<data_path>/tno/tno_macc_iii/yearly_mean/;yearly;area;;M001;W001;H001;E021;
+TNO_MACC-III;snap10;2011;0;;;co,nox_no2,so2,nh3,pm10,pm25;<data_path>/tno/tno_macc_iii/yearly_mean/;yearly;area;;M009;W001;H007;E022;
+ECLIPSEv5a;agriculture;2010;0;;;pm10,pm25,nh3;<data_path>/iiasa/eclipsev5a/monthly_mean;monthly;area;;;W001;H007;E023;
+ECLIPSEv5a;flaring;2010;0;;;co,nox_no2,nh3,pm10,pm25,oc,bc,so2,nmvoc;<data_path>/iiasa/eclipsev5a/yearly_mean;yearly;area;V006;M001;W001;H001;E024;
+ECLIPSEv5a;energy;2010;0;;;co,nox_no2,nh3,pm10,pm25,oc,bc,so2,nmvoc;<data_path>/iiasa/eclipsev5a/monthly_mean;monthly;area;V001;;W002;H002;E025;
+ECLIPSEv5a;industry;2010;0;;;co,nox_no2,nh3,pm10,pm25,oc,bc,so2,nmvoc;<data_path>/iiasa/eclipsev5a/monthly_mean;monthly;area;V002;;W003;H004;E026;
+ECLIPSEv5a;transport;2010;0;;;co,nox_no2,nh3,pm10,pm25,oc,bc,so2,nmvoc;<data_path>/iiasa/eclipsev5a/monthly_mean;monthly;area;;;W005;weekday=H006, saturday=H009, sunday=H010;E027;
+ECLIPSEv5a;residential;2010;0;;;co,nox_no2,nh3,pm10,pm25,oc,bc,so2,nmvoc;<data_path>/iiasa/eclipsev5a/monthly_mean;monthly;area;;;W003;H003;E028;
+ECLIPSEv5a;waste;2010;0;;;co,nox_no2,nh3,pm10,pm25,oc,bc,so2,nmvoc;<data_path>/iiasa/eclipsev5a/monthly_mean;monthly;area;;;W001;H001;E029;
+ECLIPSEv5.a;solvent;2010;0;;;nmvoc;<data_path>/iiasa/eclipsev5a/monthly_mean;monthly;area;;M006;W004;H005;E030;
+ECLIPSEv5a;agricultural_waste;2010;0;;;co,nox_no2,nh3,pm10,pm25,oc,bc,so2,nmvoc;<data_path>/iiasa/eclipsev5a/monthly_mean;monthly;area;;;W001;H007;E031;
+ECLIPSEv5a;ships;2010;0;;;co,nox_no2,pm10,pm25,oc,bc,so2,nmvoc;<data_path>/iiasa/eclipsev5a/yearly_mean;yearly;area;;M001;W001;H001;E032;
+EDGARv432_AP;ags;2010;0;;;nox_no2,nh3,pm10,pm25_fossil;<data_path>/jrc/edgarv432_ap/monthly_mean;monthly;area;;;W001;H007;E033;
+EDGARv432_AP;awb;2010;0;;;nox_no2,co,so2,nh3,nmvoc,pm10,bc,oc,pm25_bio;<data_path>/jrc/edgarv432_ap/monthly_mean;monthly;area;;;W001;H007;E034;
+EDGARv432_AP;che;2010;0;;;nox_no2,co,so2,nh3,nmvoc,pm10,bc,pm25_fossil;<data_path>/jrc/edgarv432_ap/monthly_mean;monthly;area;V002;;W003;H004;E035;
+EDGARv432_AP;ene;2010;0;;;nox_no2,co,so2,nh3,nmvoc,pm10,bc,oc,pm25_bio,pm25_fossil;<data_path>/jrc/edgarv432_ap/monthly_mean;monthly;area;V001;;W002;H002;E036;
+EDGARv432_AP;foo_pap;2010;0;;;nox_no2,co,so2,nmvoc,pm10,bc,pm25_fossil;<data_path>/jrc/edgarv432_ap/monthly_mean;monthly;area;V002;;W003;H004;E037;
+EDGARv432_AP;fff;2010;0;;;nox_no2,co,so2,nmvoc,pm10,bc,oc,pm25_fossil;<data_path>/jrc/edgarv432_ap/monthly_mean;monthly;area;V006;;W001;H001;E038;
+EDGARv432_AP;ind;2010;0;;;nox_no2,co,so2,nh3,nmvoc,pm10,bc,oc,pm25_bio,pm25_fossil;<data_path>/jrc/edgarv432_ap/monthly_mean;monthly;area;V002;;W003;H004;E039;
+EDGARv432_AP;iro;2010;0;;;nox_no2,co,so2,nmvoc,pm10,bc,pm25_fossil;<data_path>/jrc/edgarv432_ap/monthly_mean;monthly;area;V002;;W003;H004;E040;
+EDGARv432_AP;mnm;2010;0;;;nox_no2,nh3,pm10,pm25_fossil;<data_path>/jrc/edgarv432_ap/monthly_mean;monthly;area;;;W001;H007;E041;
+EDGARv432_AP;neu;2010;0;;;pm10;<data_path>/jrc/edgarv432_ap/monthly_mean;monthly;area;;;W001;H001;E042;
+EDGARv432_AP;nfe;2010;0;;;nox_no2,co,so2,pm10,bc,pm25_fossil;<data_path>/jrc/edgarv432_ap/monthly_mean;monthly;area;V002;;W003;H004;E043;
+EDGARv432_AP;nmm;2010;0;;;co,so2,nh3,nmvoc,pm10,bc,pm25_fossil;<data_path>/jrc/edgarv432_ap/monthly_mean;monthly;area;V002;;W003;H004;E044;
+EDGARv432_AP;pro;2010;0;;;nox_no2,co,so2,nmvoc,pm10,bc,oc,pm25_fossil;<data_path>/jrc/edgarv432_ap/monthly_mean;monthly;area;;;W001;H001;E045;
+EDGARv432_AP;pru_sol;2010;0;;;nh3,nmvoc,pm10,pm25_fossil;<data_path>/jrc/edgarv432_ap/monthly_mean;monthly;area;;;W004;H005;E046;
+EDGARv432_AP;rco;2010;0;;;nox_no2,co,so2,nh3,nmvoc,pm10,bc,oc,pm25_bio,pm25_fossil;<data_path>/jrc/edgarv432_ap/monthly_mean;monthly;area;;;W003;H003;E047;
+EDGARv432_AP;ref_trf;2010;0;;;nox_no2,co,so2,nh3,nmvoc,pm10,bc,oc,pm25_bio,pm25_fossil;<data_path>/jrc/edgarv432_ap/monthly_mean;monthly;area;V006;;W001;H001;E048;
+EDGARv432_AP;swd_inc;2010;0;;;nox_no2,co,so2,nh3,nmvoc,pm10,bc,oc,pm25_bio,pm25_fossil;<data_path>/jrc/edgarv432_ap/monthly_mean;monthly;area;V006;;W001;H001;E049;
+EDGARv432_AP;swd_ldf;2010;0;;;nh3,nmvoc,pm10,pm25_fossil;<data_path>/jrc/edgarv432_ap/monthly_mean;monthly;area;;;W001;H001;E050;
+EDGARv432_AP;tnr_aviation_cds;2010;0;;;nox_no2,co,so2,nmvoc,pm10,bc,oc,pm25_fossil;<data_path>/jrc/edgarv432_ap/monthly_mean;monthly;area;V004;;W001;H001;E051;
+EDGARv432_AP;tnr_aviation_crs;2010;0;;;nox_no2,co,so2,nmvoc,pm10,bc,oc,pm25_fossil;<data_path>/jrc/edgarv432_ap/monthly_mean;monthly;area;V005;;W001;H001;E052;
+EDGARv432_AP;tnr_aviation_lto;2010;0;;;nox_no2,co,so2,nmvoc,pm10,bc,oc,pm25_fossil;<data_path>/jrc/edgarv432_ap/monthly_mean;monthly;area;V003;;W001;H001;E053;
+EDGARv432_AP;tnr_other;2010;0;;;nox_no2,co,so2,nh3,nmvoc,pm10,bc,oc,pm25_bio,pm25_fossil;<data_path>/jrc/edgarv432_ap/monthly_mean;monthly;area;;;W001;H001;E054;
+EDGARv432_AP;tnr_ship;2010;0;;;nox_no2,co,so2,nh3,nmvoc,pm10,bc,oc,pm25_bio,pm25_fossil;<data_path>/jrc/edgarv432_ap/monthly_mean;monthly;area;;;W001;H001;E055;
+EDGARv432_AP;tro;2010;0;;;nox_no2,co,so2,nh3,nmvoc,pm10,bc,oc,pm25_bio,pm25_fossil;<data_path>/jrc/edgarv432_ap/monthly_mean;monthly;area;;;W005;weekday=H006, saturday=H009, sunday=H010;E056;
+EDGARv432_AP;wwt;2010;0;;;nh3,nmvoc;<data_path>/jrc/edgarv432_ap/monthly_mean;monthly;area;;;W001;H001;E057;
+EDGARv432_VOC;awb;2010;0;;;voc2,voc3,voc4,voc5,voc6,voc7,voc8,voc9,voc10,voc11,voc12,voc13,voc14,voc15,voc16,voc17,voc19,voc21,voc22,voc23;<data_path>/jrc/edgarv432_voc/monthly_mean;monthly;area;;;W001;H007;E058;
+EDGARv432_VOC;ene;2010;0;;;voc1,voc2,voc3,voc4,voc5,voc6,voc7,voc8,voc9,voc10,voc11,voc12,voc13,voc14,voc15,voc16,voc17,voc18,voc19,voc20,voc21,voc22,voc23,voc24;<data_path>/jrc/edgarv432_voc/monthly_mean;monthly;area;V001;;W002;H002;E059;
+EDGARv432_VOC;fff;2010;0;;;voc2,voc3,voc4,voc5,voc6,voc8,voc10,voc12,voc13,voc14,voc15,voc17,voc18,voc19,voc20;<data_path>/jrc/edgarv432_voc/monthly_mean;monthly;area;V006;;W001;H001;E060;
+EDGARv432_VOC;ind;2010;0;;;voc1,voc2,voc3,voc4,voc5,voc6,voc7,voc8,voc9,voc10,voc11,voc12,voc13,voc14,voc15,voc16,voc17,voc18,voc19,voc20,voc21,voc22,voc23,voc24;<data_path>/jrc/edgarv432_voc/monthly_mean;monthly;area;V002;;W003;H004;E061;
+EDGARv432_VOC;ppa;2010;0;;;voc1,voc2,voc3,voc4,voc5,voc6,voc7,voc8,voc9,voc10,voc11,voc12,voc13,voc14,voc15,voc16,voc17,voc18,voc19,voc20,voc21,voc22,voc23,voc24;<data_path>/jrc/edgarv432_voc/monthly_mean;monthly;area;;;W001;H001;E062;
+EDGARv432_VOC;pro;2010;0;;;voc2,voc3,voc4,voc5,voc6,voc7,voc8,voc9,voc10,voc12,voc13,voc14,voc15,voc16,voc17,voc18,voc19,voc20,voc21,voc22,voc23;<data_path>/jrc/edgarv432_voc/monthly_mean;monthly;area;;;W001;H001;E063;
+EDGARv432_VOC;rco;2010;0;;;voc1,voc2,voc3,voc4,voc5,voc6,voc7,voc8,voc9,voc10,voc11,voc12,voc13,voc14,voc15,voc16,voc17,voc18,voc19,voc20,voc21,voc22,voc23,voc24;<data_path>/jrc/edgarv432_voc/monthly_mean;monthly;area;;;W003;H003;E064;
+EDGARv432_VOC;ref;2010;0;;;voc1,voc2,voc3,voc4,voc5,voc6,voc7,voc8,voc9,voc10,voc12,voc13,voc14,voc15,voc16,voc17,voc23;<data_path>/jrc/edgarv432_voc/monthly_mean;monthly;area;V006;;W003;H004;E065;
+EDGARv432_VOC;swd;2010;0;;;voc1,voc2,voc3,voc4,voc5,voc6,voc7,voc8,voc9,voc10,voc11,voc12,voc13,voc14,voc15,voc17,voc18,voc19,voc21,voc22,voc23,voc24;<data_path>/jrc/edgarv432_voc/monthly_mean;monthly;area;;;W001;H001;E066;
+EDGARv432_VOC;tnr_aviation_cds;2010;0;;;voc1,voc2,voc3,voc5,voc6,voc7,voc8,voc9,voc12,voc13,voc14,voc15,voc16,voc17,voc21,voc22,voc23;<data_path>/jrc/edgarv432_voc/monthly_mean;monthly;area;V004;;W001;H001;E067;
+EDGARv432_VOC;tnr_aviation_crs;2010;0;;;voc1,voc2,voc3,voc5,voc6,voc7,voc8,voc9,voc12,voc13,voc14,voc15,voc16,voc17,voc21,voc22,voc23;<data_path>/jrc/edgarv432_voc/monthly_mean;monthly;area;V005;;W001;H001;E068;
+EDGARv432_VOC;tnr_aviation_lto;2010;0;;;voc1,voc2,voc3,voc5,voc6,voc7,voc8,voc9,voc12,voc13,voc14,voc15,voc16,voc17,voc21,voc22,voc23;<data_path>/jrc/edgarv432_voc/monthly_mean;monthly;area;V003;;W001;H001;E069;
+EDGARv432_VOC;tnr_other;2010;0;;;voc1,voc2,voc3,voc4,voc5,voc6,voc7,voc8,voc9,voc10,voc11,voc12,voc13,voc14,voc15,voc16,voc17,voc18,voc19,voc20,voc21,voc22,voc23,voc24;<data_path>/jrc/edgarv432_voc/monthly_mean;monthly;area;;;W001;H001;E070;
+EDGARv432_VOC;tnr_ship;2010;0;;;voc1,voc2,voc3,voc4,voc5,voc6,voc7,voc8,voc9,voc10,voc11,voc12,voc13,voc14,voc15,voc16,voc17,voc18,voc19,voc20,voc21,voc22,voc23,voc24;<data_path>/jrc/edgarv432_voc/monthly_mean;monthly;area;;;W001;H001;E071;
+EDGARv432_VOC;trf;2010;0;;;voc1,voc2,voc3,voc4,voc5,voc6,voc7,voc8,voc9,voc10,voc11,voc12,voc13,voc14,voc15,voc16,voc17,voc18,voc19,voc20,voc21,voc22,voc23,voc24;<data_path>/jrc/edgarv432_voc/monthly_mean;monthly;area;;;W001;H001;E072;
+EDGARv432_VOC;tro;2010;0;;;voc1,voc2,voc3,voc4,voc5,voc6,voc7,voc8,voc9,voc10,voc11,voc12,voc13,voc14,voc15,voc16,voc17,voc18,voc19,voc20,voc21,voc22,voc23,voc24;<data_path>/jrc/edgarv432_voc/monthly_mean;monthly;area;;;W005;weekday=H006, saturday=H009, sunday=H010;E073;
+EMEP;a_publicpower;2015;0;;;co,nox_no2,pm10,pm25,so2,nmvoc,nh3;<data_path>/ceip/emepv18/yearly_mean;yearly;area;V001;M002;W002;H002;E074;
+EMEP;b_industry;2015;0;;;co,nox_no2,pm10,pm25,so2,nmvoc,nh3;<data_path>/ceip/emepv18/yearly_mean;yearly;area;V002;M004;W003;H004;E075;
+EMEP;c_otherstationarycomb;2015;0;;;co,nox_no2,pm10,pm25,so2,nmvoc,nh3;<data_path>/ceip/emepv18/yearly_mean;yearly;area;;M003;W003;H003;E076;
+EMEP;d_fugitive;2015;0;;;co,nox_no2,pm10,pm25,so2,nmvoc,nh3;<data_path>/ceip/emepv18/yearly_mean;yearly;area;;M005;W001;H001;E077;
+EMEP;e_solvents;2015;0;;;co,nox_no2,pm10,pm25,so2,nmvoc,nh3;<data_path>/ceip/emepv18/yearly_mean;yearly;area;;M006;W004;H005;E078;
+EMEP;f_roadtransport;2015;0;;;co,nox_no2,pm10,pm25,so2,nmvoc,nh3;<data_path>/ceip/emepv18/yearly_mean;yearly;area;;M007;W005;weekday=H006, saturday=H009, sunday=H010;E079;
+EMEP;g_shipping;2015;0;;;co,nox_no2,pm10,pm25,so2,nmvoc,nh3;<data_path>/ceip/emepv18/yearly_mean;yearly;area;;M001;W001;H001;E080;
+EMEP;h_aviation;2015;0;;;co,nox_no2,pm10,pm25,so2,nmvoc,nh3;<data_path>/ceip/emepv18/yearly_mean;yearly;area;V003;M001;W001;H001;E081;
+EMEP;i_offroad;2015;0;;;co,nox_no2,pm10,pm25,so2,nmvoc,nh3;<data_path>/ceip/emepv18/yearly_mean;yearly;area;;M001;W001;H001;E082;
+EMEP;j_waste;2015;0;;;co,nox_no2,pm10,pm25,so2,nmvoc,nh3;<data_path>/ceip/emepv18/yearly_mean;yearly;area;;M001;W001;H001;E083;
+EMEP;k_agrilivestock;2015;0;;;co,nox_no2,pm10,pm25,so2,nmvoc,nh3;<data_path>/ceip/emepv18/yearly_mean;yearly;area;;M009;W001;H007;E084;
+EMEP;l_agriother;2015;0;;;co,nox_no2,pm10,pm25,so2,nmvoc,nh3;<data_path>/ceip/emepv18/yearly_mean;yearly;area;;M009;W001;H007;E085;
+carn;;2015;1;;;so2;<data_path>/mtu/carnetal/yearly_mean;yearly;point;;M001;W001;H001;E086;
+CEDS;agriculture;2014;0;;;nox_no2,nh3;<data_path>/jgcri/ceds/monthly_mean;monthly;area;;;W001;H007;E087;
+CEDS;energy;2014;0;;;co,nox_no2,oc,bc,so2,nh3,voc01,voc02,voc03,voc04,voc05,voc06,voc07,voc08,voc09,voc12,voc13,voc14,voc15,voc16,voc17,voc18,voc19,voc20,voc21,voc22,voc23,voc24;<data_path>/jgcri/ceds/monthly_mean;monthly;area;V001;;W002;H002;E088;
+CEDS;industrial;2014;0;;;co,nox_no2,oc,bc,so2,nh3,voc01,voc02,voc03,voc04,voc05,voc06,voc07,voc08,voc09,voc12,voc13,voc14,voc15,voc16,voc17,voc18,voc19,voc20,voc21,voc22,voc23,voc24;<data_path>/jgcri/ceds/monthly_mean;monthly;area;V002;;W003;H004;E089;
+CEDS;transportation;2014;0;;;co,nox_no2,oc,bc,so2,nh3,voc01,voc02,voc03,voc04,voc05,voc06,voc07,voc08,voc09,voc12,voc13,voc14,voc15,voc16,voc17,voc18,voc19,voc20,voc21,voc22,voc23,voc24;<data_path>/jgcri/ceds/monthly_mean;monthly;area;;;W005;weekday=H006, saturday=H009, sunday=H010;E090;
+CEDS;residential;2014;0;;;co,nox_no2,oc,bc,so2,nh3,voc01,voc02,voc03,voc04,voc05,voc06,voc07,voc08,voc09,voc12,voc13,voc14,voc15,voc16,voc17,voc18,voc19,voc20,voc21,voc22,voc23,voc24;<data_path>/jgcri/ceds/monthly_mean;monthly;area;;;W003;H003;E091;
+CEDS;solvent;2014;0;;;voc1,voc2,voc3,voc4,voc5,voc6,voc7,voc8,voc9,voc12,voc13,voc14,voc15,voc16,voc17,voc18,voc19,voc20,voc21,voc22,voc23,voc24;<data_path>/jgcri/ceds/monthly_mean;monthly;area;;;W004;H005;E092;
+CEDS;waste;2014;0;;;co,nox_no2,oc,bc,so2,nh3,voc01,voc02,voc03,voc04,voc05,voc06,voc07,voc08,voc09,voc12,voc13,voc14,voc15,voc16,voc17,voc18,voc19,voc20,voc21,voc22,voc23,voc24;<data_path>/jgcri/ceds/monthly_mean;monthly;area;;;W001;H001;E093;
+CEDS;shipping;2014;0;;;co,nox_no2,oc,bc,so2,nh3,voc01,voc02,voc03,voc04,voc05,voc06,voc07,voc08,voc09,voc12,voc13,voc14,voc15,voc16,voc17,voc18,voc19,voc20,voc21,voc22,voc23,voc24;<data_path>/jgcri/ceds/monthly_mean;monthly;area;;;W001;H001;E094;
+CEDS;air;2014;0;;;co,nox_no2,oc,bc,so2,nh3,nmvoc;<data_path>/jgcri/ceds/monthly_mean;monthly;area;;;W001;H001;E095;
\ No newline at end of file
diff --git a/data/profiles/temporal/TemporalProfile_Daily.csv b/data/profiles/temporal/TemporalProfile_Daily.csv
deleted file mode 100644
index e48ec1dc8b1e98af2f484c96578626a582ba1a61..0000000000000000000000000000000000000000
--- a/data/profiles/temporal/TemporalProfile_Daily.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-TP_D,0,1,2,3,4,5,6
-D001,1,1,1,1,1,1,1
-D002,1.06,1.06,1.06,1.06,1.06,0.85,0.85
-D003,1.08,1.08,1.08,1.08,1.08,0.8,0.8
-D004,1.2,1.2,1.2,1.2,1.2,0.5,0.5
-D005,1.02,1.06,1.08,1.1,1.14,0.81,0.79
-
diff --git a/data/profiles/temporal/TemporalProfile_Weekly.csv b/data/profiles/temporal/TemporalProfile_Weekly.csv
new file mode 100644
index 0000000000000000000000000000000000000000..5d9b66aaea346d3434fae76b6bfb92393a778e3a
--- /dev/null
+++ b/data/profiles/temporal/TemporalProfile_Weekly.csv
@@ -0,0 +1,7 @@
+TP_W,0,1,2,3,4,5,6
+W001,1,1,1,1,1,1,1
+W002,1.06,1.06,1.06,1.06,1.06,0.85,0.85
+W003,1.08,1.08,1.08,1.08,1.08,0.8,0.8
+W004,1.2,1.2,1.2,1.2,1.2,0.5,0.5
+W005,1.02,1.06,1.08,1.1,1.14,0.81,0.79
+
diff --git a/hermesv3_gr/config/config.py b/hermesv3_gr/config/config.py
index 36d9db4dffb2971102fca7702ca350df2ab74aa0..c568e4a4c4775515653d4eee0acda0050c6e1061 100644
--- a/hermesv3_gr/config/config.py
+++ b/hermesv3_gr/config/config.py
@@ -140,7 +140,7 @@ class Config(ArgParser):
                        help='Path to the file that contains all the needed vertical profiles.')
         p.add_argument('--p_month', required=True,
                        help='Path to the file that contains all the needed monthly profiles.')
-        p.add_argument('--p_day', required=True, help='Path to the file that contains all the needed daily profiles.')
+        p.add_argument('--p_week', required=True, help='Path to the file that contains all the needed weekly profiles.')
         p.add_argument('--p_hour', required=True, help='Path to the file that contains all the needed hourly profiles.')
         p.add_argument('--p_speciation', required=True,
                        help='Path to the file that contains all the needed speciation profiles.')
diff --git a/hermesv3_gr/modules/emision_inventories/emission_inventory.py b/hermesv3_gr/modules/emision_inventories/emission_inventory.py
index 0c3df52470998c04e3c611ed282cff29992e0426..d8d92657ca6abf1402236556976b1aea7e00b0c3 100644
--- a/hermesv3_gr/modules/emision_inventories/emission_inventory.py
+++ b/hermesv3_gr/modules/emision_inventories/emission_inventory.py
@@ -32,7 +32,7 @@ class EmissionInventory(object):
     """
     Class that defines the content and the methodology for the area emission inventories
 
-    :param current_date: Date of the day to simulate.
+    :param current_date: Date to simulate.
     :type current_date: datetime.datetime
 
     :param inventory_name: Name of the inventory to use.
@@ -65,8 +65,8 @@ class EmissionInventory(object):
     :param p_month: ID of the temporal monthly profile to use.
     :type p_month: str
 
-    :param p_day: ID of the temporal daily profile to use.
-    :type p_day: str
+    :param p_week: ID of the temporal daily profile to use.
+    :type p_week: str
 
     :param p_hour: ID of the temporal hourly profile to use.
     :type p_hour: str
@@ -76,7 +76,7 @@ class EmissionInventory(object):
     """
     def __init__(self, options, grid, current_date, inventory_name, source_type, sector, pollutants, inputs_path,
                  input_frequency, vertical_output_profile, reference_year=2010, factors=None, regrid_mask=None,
-                 p_vertical=None, p_month=None, p_day=None, p_hour=None, p_speciation=None):
+                 p_vertical=None, p_month=None, p_week=None, p_hour=None, p_speciation=None):
         from hermesv3_gr.modules.masking.masking import Masking
 
         st_time = timeit.default_timer()
@@ -95,7 +95,7 @@ class EmissionInventory(object):
         # Profiles
         p_vertical = self.get_profile(p_vertical)
         p_month = self.get_profile(p_month)
-        p_day = self.get_profile(p_day)
+        p_week = self.get_profile(p_week)
         p_hour = self.get_profile(p_hour)
         p_speciation = self.get_profile(p_speciation)
 
@@ -132,10 +132,10 @@ class EmissionInventory(object):
 
         # Creating Temporal Object
         # It will also create the necessaries timezone files
-        if not((p_month is None) and (p_day is None) and (p_hour is None)):
+        if not((p_month is None) and (p_week is None) and (p_hour is None)):
             self.temporal = TemporalDistribution(
                 current_date, options.output_timestep_type, options.output_timestep_num, options.output_timestep_freq,
-                options.p_month, p_month, options.p_day, p_day, options.p_hour, p_hour, options.world_info,
+                options.p_month, p_month, options.p_week, p_week, options.p_hour, p_hour, options.world_info,
                 options.auxiliar_files_path, grid)
         else:
             self.temporal = None
@@ -279,7 +279,7 @@ class EmissionInventory(object):
         :param vertical_output_profile: Path to eht file that contains the vertical profile.
         :type vertical_output_profile: str
 
-        :param date: Date to the day to simulate.
+        :param date: Date to simulate.
         :type date: datetime.datetime
 
         :return: List of Emission inventories already loaded.
@@ -297,7 +297,7 @@ class EmissionInventory(object):
         path = options.cross_table
         df = pd.read_csv(path, sep=';', index_col=False)
         for column in ['ei', 'sector', 'ref_year', 'active', 'factor_mask', 'regrid_mask', 'pollutants', 'path',
-                       'frequency', 'source_type', 'p_vertical', 'p_month', 'p_day', 'p_hour', 'p_speciation']:
+                       'frequency', 'source_type', 'p_vertical', 'p_month', 'p_week', 'p_hour', 'p_speciation']:
             df_cols = list(df.columns.values)
             if column not in df_cols:
                 settings.write_log('ERROR: Check the .err file to get more info.')
@@ -334,7 +334,7 @@ class EmissionInventory(object):
                                               regrid_mask=emission_inventory.regrid_mask,
                                               p_vertical=emission_inventory.p_vertical,
                                               p_month=p_month,
-                                              p_day=emission_inventory.p_day,
+                                              p_week=emission_inventory.p_week,
                                               p_hour=emission_inventory.p_hour,
                                               p_speciation=emission_inventory.p_speciation))
                 else:
@@ -348,7 +348,7 @@ class EmissionInventory(object):
                                           regrid_mask=emission_inventory.regrid_mask,
                                           p_vertical=emission_inventory.p_vertical,
                                           p_month=p_month,
-                                          p_day=emission_inventory.p_day,
+                                          p_week=emission_inventory.p_week,
                                           p_hour=emission_inventory.p_hour,
                                           p_speciation=emission_inventory.p_speciation))
             elif emission_inventory.source_type == 'point':
@@ -360,7 +360,7 @@ class EmissionInventory(object):
                             emission_inventory.frequency, vertical_output_profile,
                             reference_year=emission_inventory.ref_year, factors=emission_inventory.factor_mask,
                             regrid_mask=emission_inventory.regrid_mask, p_vertical=emission_inventory.p_vertical,
-                            p_month=p_month, p_day=emission_inventory.p_day, p_hour=emission_inventory.p_hour,
+                            p_month=p_month, p_week=emission_inventory.p_week, p_hour=emission_inventory.p_hour,
                             p_speciation=emission_inventory.p_speciation))
                 else:
                     emission_inventory_list.append(
@@ -373,7 +373,7 @@ class EmissionInventory(object):
                                                      regrid_mask=emission_inventory.regrid_mask,
                                                      p_vertical=emission_inventory.p_vertical,
                                                      p_month=p_month,
-                                                     p_day=emission_inventory.p_day,
+                                                     p_week=emission_inventory.p_week,
                                                      p_hour=emission_inventory.p_hour,
                                                      p_speciation=emission_inventory.p_speciation))
             else:
diff --git a/hermesv3_gr/modules/emision_inventories/gfas_emission_inventory.py b/hermesv3_gr/modules/emision_inventories/gfas_emission_inventory.py
index a03cc27933ae585340d12e27ccf3de4779df948e..08baa77c8daf25a00335932140383afaf6152c3c 100755
--- a/hermesv3_gr/modules/emision_inventories/gfas_emission_inventory.py
+++ b/hermesv3_gr/modules/emision_inventories/gfas_emission_inventory.py
@@ -28,7 +28,7 @@ class GfasEmissionInventory(EmissionInventory):
     """
     Class that defines the content and the methodology for the GFAS emission inventories
 
-    :param current_date: Date of the day to simulate.
+    :param current_date: Date to simulate.
     :type current_date: datetime.datetime
 
     :param inventory_name: Name of the inventory to use.
@@ -58,8 +58,8 @@ class GfasEmissionInventory(EmissionInventory):
     :param p_month: ID of the temporal monthly profile to use.
     :type p_month: str
 
-    :param p_day: ID of the temporal daily profile to use.
-    :type p_day: str
+    :param p_week: ID of the temporal daily profile to use.
+    :type p_week: str
 
     :param p_hour: ID of the temporal hourly profile to use.
     :type p_hour: str
@@ -70,7 +70,7 @@ class GfasEmissionInventory(EmissionInventory):
 
     def __init__(self, options, grid, current_date, inventory_name, source_type, sector, pollutants, inputs_path,
                  frequency, vertical_output_profile,
-                 reference_year=2010, factors=None, regrid_mask=None, p_vertical=None, p_month=None, p_day=None,
+                 reference_year=2010, factors=None, regrid_mask=None, p_vertical=None, p_month=None, p_week=None,
                  p_hour=None, p_speciation=None):
         from hermesv3_gr.modules.vertical.vertical_gfas import GfasVerticalDistribution
 
@@ -81,7 +81,7 @@ class GfasEmissionInventory(EmissionInventory):
             options, grid, current_date, inventory_name, source_type, sector, pollutants, inputs_path, frequency,
             vertical_output_profile,
             reference_year=reference_year, factors=factors, regrid_mask=regrid_mask, p_vertical=None,
-            p_month=p_month, p_day=p_day, p_hour=p_hour, p_speciation=p_speciation)
+            p_month=p_month, p_week=p_week, p_hour=p_hour, p_speciation=p_speciation)
 
         self.approach = self.get_approach(p_vertical)
         self.method = self.get_method(p_vertical)
diff --git a/hermesv3_gr/modules/emision_inventories/point_gfas_emission_inventory.py b/hermesv3_gr/modules/emision_inventories/point_gfas_emission_inventory.py
index 35663df73328033b9d423ba3195146e731750c49..4a5dd7bbece7aaec74a3bb9f87e86f5989506554 100755
--- a/hermesv3_gr/modules/emision_inventories/point_gfas_emission_inventory.py
+++ b/hermesv3_gr/modules/emision_inventories/point_gfas_emission_inventory.py
@@ -30,7 +30,7 @@ class PointGfasEmissionInventory(EmissionInventory):
     """
     Class that defines the content and the methodology for the GFAS emission inventories
 
-    :param current_date: Date of the day to simulate.
+    :param current_date: Date to simulate.
     :type current_date: datetime.datetime
 
     :param inventory_name: Name of the inventory to use.
@@ -60,8 +60,8 @@ class PointGfasEmissionInventory(EmissionInventory):
     :param p_month: ID of the temporal monthly profile to use.
     :type p_month: str
 
-    :param p_day: ID of the temporal daily profile to use.
-    :type p_day: str
+    :param p_week: ID of the temporal daily profile to use.
+    :type p_week: str
 
     :param p_hour: ID of the temporal hourly profile to use.
     :type p_hour: str
@@ -72,7 +72,7 @@ class PointGfasEmissionInventory(EmissionInventory):
 
     def __init__(self, options, grid, current_date, inventory_name, source_type, sector, pollutants, inputs_path,
                  frequency, vertical_output_profile,
-                 reference_year=2010, factors=None, regrid_mask=None, p_vertical=None, p_month=None, p_day=None,
+                 reference_year=2010, factors=None, regrid_mask=None, p_vertical=None, p_month=None, p_week=None,
                  p_hour=None, p_speciation=None):
         from hermesv3_gr.modules.vertical.vertical_gfas import GfasVerticalDistribution
 
@@ -82,7 +82,7 @@ class PointGfasEmissionInventory(EmissionInventory):
             options, grid, current_date, inventory_name, source_type, sector, pollutants, inputs_path, frequency,
             vertical_output_profile,
             reference_year=reference_year, factors=factors, regrid_mask=regrid_mask, p_vertical=None,
-            p_month=p_month, p_day=p_day, p_hour=p_hour, p_speciation=p_speciation)
+            p_month=p_month, p_week=p_week, p_hour=p_hour, p_speciation=p_speciation)
 
         # self.approach = self.get_approach(p_vertical)
         self.method = self.get_method(p_vertical)
diff --git a/hermesv3_gr/modules/emision_inventories/point_source_emission_inventory.py b/hermesv3_gr/modules/emision_inventories/point_source_emission_inventory.py
index a66f65b638c0665d6d174262d298f27a46eb6cf4..072e5b6bb5e56e527e289c94795cb80669a9e912 100755
--- a/hermesv3_gr/modules/emision_inventories/point_source_emission_inventory.py
+++ b/hermesv3_gr/modules/emision_inventories/point_source_emission_inventory.py
@@ -63,8 +63,8 @@ class PointSourceEmissionInventory(EmissionInventory):
     :param p_month: ID of the temporal monthly profile to use.
     :type p_month: str
 
-    :param p_day: ID of the temporal daily profile to use.
-    :type p_day: str
+    :param p_week: ID of the temporal daily profile to use.
+    :type p_week: str
 
     :param p_hour: ID of the temporal hourly profile to use.
     :type p_hour: str
@@ -75,7 +75,7 @@ class PointSourceEmissionInventory(EmissionInventory):
 
     def __init__(self, options, grid, current_date, inventory_name, source_type, sector, pollutants, inputs_path,
                  frequency, vertical_output_profile, reference_year=2010, factors=None, regrid_mask=None,
-                 p_vertical=None, p_month=None, p_day=None, p_hour=None, p_speciation=None):
+                 p_vertical=None, p_month=None, p_week=None, p_hour=None, p_speciation=None):
 
         st_time = timeit.default_timer()
         settings.write_log('\t\tCreating point source emission inventory.', level=3)
@@ -83,7 +83,7 @@ class PointSourceEmissionInventory(EmissionInventory):
         super(PointSourceEmissionInventory, self).__init__(
             options, grid, current_date, inventory_name, source_type, sector, pollutants, inputs_path, frequency,
             vertical_output_profile, reference_year=reference_year, factors=factors, regrid_mask=regrid_mask,
-            p_vertical=p_vertical, p_month=p_month, p_day=p_day, p_hour=p_hour, p_speciation=p_speciation)
+            p_vertical=p_vertical, p_month=p_month, p_week=p_week, p_hour=p_hour, p_speciation=p_speciation)
 
         self.crs = {'init': 'epsg:4326'}
         self.location = None
diff --git a/hermesv3_gr/modules/temporal/temporal.py b/hermesv3_gr/modules/temporal/temporal.py
index 82e1e36e9f3316bf4bb004d97596bcbd8bde974e..934122917d80403015054932dc3c35f75927d4f4 100644
--- a/hermesv3_gr/modules/temporal/temporal.py
+++ b/hermesv3_gr/modules/temporal/temporal.py
@@ -49,10 +49,10 @@ class TemporalDistribution(object):
     :type month_profile_id: str
 
     :param daily_profile_path: Path to the file that contains all the daily profiles.
-    :type daily_profile_path: str
+    :type weekly_profile_path: str
 
     :param daily_profile_id: ID of the daily profile to use.
-    :type daily_profile_id: str
+    :type weekly_profile_id: str
 
     :param hourly_profile_path: Path to the file that contains all the hourly profiles.
     :type hourly_profile_path: str
@@ -68,7 +68,7 @@ class TemporalDistribution(object):
     :type auxiliar_files_dir: str
     """
     def __init__(self, starting_date, timestep_type, timestep_num, timestep_freq, monthly_profile_path,
-                 month_profile_id, daily_profile_path, daily_profile_id, hourly_profile_path, hourly_profile_id,
+                 month_profile_id, weekly_profile_path, weekly_profile_id, hourly_profile_path, hourly_profile_id,
                  world_info_path, auxiliar_files_dir, grid):
         from timezonefinder import TimezoneFinder
 
@@ -105,11 +105,11 @@ class TemporalDistribution(object):
             self.monthly_profile = None
             settings.write_log("\t\t\tNo temporal monthly profile is set.", level=3)
 
-        self.daily_profile_id = daily_profile_id
-        self.daily_profile_path = daily_profile_path
-        if daily_profile_id is not None:
+        self.weekly_profile_id = weekly_profile_id
+        self.weekly_profile_path = weekly_profile_path
+        if weekly_profile_id is not None:
             settings.write_log("\t\t\tGetting temporal daily profile id '{0}' from {1} .".format(
-                daily_profile_id, daily_profile_path), level=3)
+                weekly_profile_id, weekly_profile_path), level=3)
         else:
             settings.write_log("\t\t\tNo temporal daily profile is set.", level=3)
 
@@ -447,7 +447,7 @@ class TemporalDistribution(object):
         df.set_index('local', inplace=True)
 
         df['month'] = df.index.month
-        df['day'] = df.index.weekday
+        df['weekday'] = df.index.weekday
         df['hour'] = df.index.hour
 
         if self.hourly_profile is not None:
@@ -458,28 +458,28 @@ class TemporalDistribution(object):
                 weekday_profile = self.get_temporal_hourly_profile(profile_ids['weekday'])
                 saturday_profile = self.get_temporal_hourly_profile(profile_ids['saturday'])
                 sunday_profile = self.get_temporal_hourly_profile(profile_ids['sunday'])
-                df['weekday'] = df['hour'].map(weekday_profile)
-                df['saturday'] = df['hour'].map(saturday_profile)
-                df['sunday'] = df['hour'].map(sunday_profile)
+                df['weekday_factor'] = df['hour'].map(weekday_profile)
+                df['saturday_factor'] = df['hour'].map(saturday_profile)
+                df['sunday_factor'] = df['hour'].map(sunday_profile)
 
                 del df['tz'], df['utc']
                 df['hour_factor'] = 0
 
-                df.loc[df['day'] <= 4, 'hour_factor'] = df['weekday'][df['day'] <= 4].values
-                df.loc[df['day'] == 5, 'hour_factor'] = df['saturday'][df['day'] == 5].values
-                df.loc[df['day'] == 6, 'hour_factor'] = df['sunday'][df['day'] == 6].values
+                df.loc[df['weekday'] <= 4, 'hour_factor'] = df['weekday_factor'][df['weekday'] <= 4].values
+                df.loc[df['weekday'] == 5, 'hour_factor'] = df['saturday_factor'][df['weekday'] == 5].values
+                df.loc[df['weekday'] == 6, 'hour_factor'] = df['sunday_factor'][df['weekday'] == 6].values
 
-                del df['weekday'], df['saturday'], df['sunday']
+                del df['weekday_factor'], df['saturday_factor'], df['sunday_factor']
         else:
             df['hour_factor'] = 1
         del df['hour']
 
-        if self.daily_profile_id is not None:
+        if self.weekly_profile_id is not None:
             daily_profile = self.get_temporal_daily_profile(date)
-            df['day_factor'] = df['day'].map(daily_profile)
+            df['week_factor'] = df['weekday'].map(daily_profile)
         else:
-            df['day_factor'] = 1
-        del df['day']
+            df['week_factor'] = 1
+        del df['weekday']
 
         if self.monthly_profile is None:
             df['month_factor'] = 1
@@ -500,7 +500,7 @@ class TemporalDistribution(object):
             df['month_factor'] = 1
         del df['month']
 
-        df['factor'] = df['month_factor'] * df['day_factor'] * df['hour_factor']
+        df['factor'] = df['month_factor'] * df['week_factor'] * df['hour_factor']
 
         # TODO make timezones_aray 2D
         factors = np.array(df['factor'].values).reshape((self.timezones_array.shape[1], self.timezones_array.shape[2]))
@@ -611,17 +611,17 @@ class TemporalDistribution(object):
 
         st_time = timeit.default_timer()
 
-        if self.daily_profile_id is not None:
-            df = pd.read_csv(self.daily_profile_path)
+        if self.weekly_profile_id is not None:
+            df = pd.read_csv(self.weekly_profile_path)
             try:
-                profile = df.loc[df[df.TP_D == self.daily_profile_id].index[0]].to_dict()
+                profile = df.loc[df[df.TP_W == self.weekly_profile_id].index[0]].to_dict()
             except IndexError:
                 settings.write_log('ERROR: Check the .err file to get more info.')
                 if settings.rank == 0:
                     raise AttributeError('ERROR: Daily profile ID {0} is not in the {1} file.'.format(
-                        self.daily_profile_id, self.daily_profile_path))
+                        self.weekly_profile_id, self.weekly_profile_path))
                 sys.exit(1)
-            profile.pop('TP_D', None)
+            profile.pop('TP_W', None)
             profile_aux = {int(k): float(v) for k, v in profile.items()}
             rebalance_factor = self.calculate_rebalance_factor(profile_aux, date)
             profile = {int(k): float(v) + rebalance_factor for k, v in profile.items()}
@@ -673,9 +673,9 @@ class TemporalDistribution(object):
 
         weekdays_factors = 0
         num_days = 0
-        for day in xrange(7):
-            weekdays_factors += profile[day] * weekdays[day]
-            num_days += weekdays[day]
+        for weekday in xrange(7):
+            weekdays_factors += profile[weekday] * weekdays[weekday]
+            num_days += weekdays[weekday]
 
         settings.write_time('TemporalDistribution', 'calculate_weekday_factor_full_month',
                             timeit.default_timer() - st_time, level=3)