diff --git a/input/notation.csv b/input/notation.csv
index c80e80c..667444e 100644
--- a/input/notation.csv
+++ b/input/notation.csv
@@ -1,8 +1,8 @@
 region,variable,attribute,Explanation
-"ISO-2 digit country code and name of balancing area if applicable, eg. DE_amprion",load,old,Hourly Load from ENTSO-E Data Portal
-"ISO-2 digit country code and name of balancing area if applicable, eg. DE_amprion",load,new,Hourly Load from ENTSO-E Transparency Platform
-"ISO-2 digit country code and name of balancing area if applicable, eg. DE_amprion",price,day_ahead,Day-ahead spot price
-"ISO-2 digit country code and name of balancing area if applicable, eg. DE_amprion",solar  / wind-onshore / wind-offshore,generation,Electricity produced py solar power plants
-"ISO-2 digit country code and name of balancing area if applicable, eg. DE_amprion",solar  / wind-onshore / wind-offshore,forecast,Day-ahead generation forecast
-"ISO-2 digit country code and name of balancing area if applicable, eg. DE_amprion",solar  / wind-onshore / wind-offshore,capacity,Installed capacity (actual availability not accounted for)
-"ISO-2 digit country code and name of balancing area if applicable, eg. DE_amprion",solar  / wind-onshore / wind-offshore,profile,Share of installed capacity producing
+"ISO-2 digit country code and name of control  balancing area if applicable, eg. DE_amprion",load,entsoe_power_statistics,Hourly Load from ENTSO-E Data Portal
+"ISO-2 digit country code and name of control  balancing area if applicable, eg. DE_amprion",load,entsoe_transparency,Hourly Load from ENTSO-E Transparency Platform
+"ISO-2 digit country code and name of control  balancing area if applicable, eg. DE_amprion",price,day_ahead,Day-ahead spot price
+"ISO-2 digit country code and name of control  balancing area if applicable, eg. DE_amprion",solar  / wind-onshore / wind-offshore,generation_actual,Electricity produced py solar power plants
+"ISO-2 digit country code and name of control  balancing area if applicable, eg. DE_amprion",solar  / wind-onshore / wind-offshore,generation_forecast,Day-ahead generation forecast
+"ISO-2 digit country code and name of control  balancing area if applicable, eg. DE_amprion",solar  / wind-onshore / wind-offshore,capacity,Installed capacity (actual availability not accounted for)
+"ISO-2 digit country code and name of control  balancing area if applicable, eg. DE_amprion",solar  / wind-onshore / wind-offshore,profile,Share of installed capacity producing
diff --git a/main.ipynb b/main.ipynb
index 189ac58..0bb564b 100644
--- a/main.ipynb
+++ b/main.ipynb
@@ -14,18 +14,14 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "<table style=\"width:100%; background-color: #EBF5FB\">\n",
-    "  <tr>\n",
-    "    <td style=\"border: 1px solid #CFCFCF\">\n",
-    "      <b>Time series: Main Notebook</b>\n",
+    "<div style=\"width:100%; background-color: #D9EDF7; border: 1px solid #CFCFCF; text-align: left; padding: 10px;\">\n",
+    "      <b>Time series: Processing Notebook</b>\n",
     "      <ul>\n",
     "        <li>Main Notebook</li>\n",
     "        <li><a href=\"processing.ipynb\">Processing Notebook</a></li>\n",
     "      </ul>\n",
     "      <br>This Notebook is part of the <a href=\"http://data.open-power-system-data.org/time_series\">Time series Data Package</a> of <a href=\"http://open-power-system-data.org\">Open Power System Data</a>.\n",
-    "    </td>\n",
-    "  </tr>\n",
-    "</table>"
+    "</div>"
    ]
   },
   {
@@ -106,10 +102,6 @@
    "cell_type": "code",
    "execution_count": 1,
    "metadata": {
-    "ExecuteTime": {
-     "end_time": "2017-07-09T20:05:35.988809Z",
-     "start_time": "2017-07-09T20:05:35.964789Z"
-    },
     "scrolled": true
    },
    "outputs": [
@@ -147,13 +139,13 @@
        "  </thead>\n",
        "  <tbody>\n",
        "    <tr>\n",
-       "      <th rowspan=\"7\" valign=\"top\">ISO-2 digit country code and name of balancing area if applicable, eg. DE_amprion</th>\n",
+       "      <th rowspan=\"7\" valign=\"top\">ISO-2 digit country code and name of control  balancing area if applicable, eg. DE_amprion</th>\n",
        "      <th rowspan=\"2\" valign=\"top\">load</th>\n",
-       "      <th>old</th>\n",
+       "      <th>entsoe_power_statistics</th>\n",
        "      <th>Hourly Load from ENTSO-E Data Portal</th>\n",
        "    </tr>\n",
        "    <tr>\n",
-       "      <th>new</th>\n",
+       "      <th>entsoe_transparency</th>\n",
        "      <th>Hourly Load from ENTSO-E Transparency Platform</th>\n",
        "    </tr>\n",
        "    <tr>\n",
@@ -163,11 +155,11 @@
        "    </tr>\n",
        "    <tr>\n",
        "      <th rowspan=\"4\" valign=\"top\">solar  / wind-onshore / wind-offshore</th>\n",
-       "      <th>generation</th>\n",
+       "      <th>generation_actual</th>\n",
        "      <th>Electricity produced py solar power plants</th>\n",
        "    </tr>\n",
        "    <tr>\n",
-       "      <th>forecast</th>\n",
+       "      <th>generation_forecast</th>\n",
        "      <th>Day-ahead generation forecast</th>\n",
        "    </tr>\n",
        "    <tr>\n",
@@ -185,7 +177,7 @@
       "text/plain": [
        "Empty DataFrame\n",
        "Columns: []\n",
-       "Index: [(ISO-2 digit country code and name of balancing area if applicable, eg. DE_amprion, load, old, Hourly Load from ENTSO-E Data Portal), (ISO-2 digit country code and name of balancing area if applicable, eg. DE_amprion, load, new, Hourly Load from ENTSO-E Transparency Platform), (ISO-2 digit country code and name of balancing area if applicable, eg. DE_amprion, price, day_ahead, Day-ahead spot price), (ISO-2 digit country code and name of balancing area if applicable, eg. DE_amprion, solar  / wind-onshore / wind-offshore, generation, Electricity produced py solar power plants), (ISO-2 digit country code and name of balancing area if applicable, eg. DE_amprion, solar  / wind-onshore / wind-offshore, forecast, Day-ahead generation forecast), (ISO-2 digit country code and name of balancing area if applicable, eg. DE_amprion, solar  / wind-onshore / wind-offshore, capacity, Installed capacity (actual availability not accounted for)), (ISO-2 digit country code and name of balancing area if applicable, eg. DE_amprion, solar  / wind-onshore / wind-offshore, profile, Share of installed capacity producing)]"
+       "Index: [(ISO-2 digit country code and name of control  balancing area if applicable, eg. DE_amprion, load, entsoe_power_statistics, Hourly Load from ENTSO-E Data Portal), (ISO-2 digit country code and name of control  balancing area if applicable, eg. DE_amprion, load, entsoe_transparency, Hourly Load from ENTSO-E Transparency Platform), (ISO-2 digit country code and name of control  balancing area if applicable, eg. DE_amprion, price, day_ahead, Day-ahead spot price), (ISO-2 digit country code and name of control  balancing area if applicable, eg. DE_amprion, solar  / wind-onshore / wind-offshore, generation_actual, Electricity produced py solar power plants), (ISO-2 digit country code and name of control  balancing area if applicable, eg. DE_amprion, solar  / wind-onshore / wind-offshore, generation_forecast, Day-ahead generation forecast), (ISO-2 digit country code and name of control  balancing area if applicable, eg. DE_amprion, solar  / wind-onshore / wind-offshore, capacity, Installed capacity (actual availability not accounted for)), (ISO-2 digit country code and name of control  balancing area if applicable, eg. DE_amprion, solar  / wind-onshore / wind-offshore, profile, Share of installed capacity producing)]"
       ]
      },
      "execution_count": 1,
@@ -219,18 +211,6 @@
    "language": "python",
    "name": "python3"
   },
-  "language_info": {
-   "codemirror_mode": {
-    "name": "ipython",
-    "version": 3
-   },
-   "file_extension": ".py",
-   "mimetype": "text/x-python",
-   "name": "python",
-   "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3",
-   "version": "3.6.3"
-  },
   "toc": {
    "nav_menu": {
     "height": "120px",