diff --git a/Jenkinsfile b/Jenkinsfile
index 5bfca89..ac83207 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,24 +1,8 @@
- // not required right now as CN is reachable from EMEA as well
- def loopEnvironments(environments) {
-     print env.JENKINS_URL 
-     
-    environments.each{key, val ->
-        // Execute only if you are on the same environment
-        // not required right now as CN is reachable from EMEA as well
-        if(env.JENKINS_URL == environments."${key}"[3].'jenkins'){
-            envname = environments."${key}"[0].'name'
-            envurl = environments."${key}"[1].'env-url'
-            tokenname = environments."${key}"[2].'env-token-name'
-
-            sh 'python createReport.py "${envname}"'
-        }        
-    }
- }
-
 def installRetryCount = 0
 def reportRetryCount = 0
 def checkRetryCount = 0
 def checkRetryCountSec = 0
+
 pipeline {
 
 	options {
@@ -26,7 +10,6 @@ pipeline {
     }
 
     // label libraryBuild is available in CN JAWS and ROW JAWS, therefore this one was used; no additional intents     
-    // agent {label 'jaws-slaves'}
     agent {label 'jaws-slaves'}
 
     parameters {
@@ -34,7 +17,7 @@ pipeline {
         string(name: 'TODATE', defaultValue: '', description: 'Enter to date in format YYYY-MM-DD e.g. 2021-11-30')
         string(name: 'PRESELECT', defaultValue: 'day', description: 'Enter day | week | month (without |) - auto selects the last full day, week or month')
         string(name: 'SLICES', defaultValue: 'dt', description: 'Enter h | d | t | y (without spaces or |) - writes the slices hourly, daily, total or year to date into excel given in any order')
-        // string(name: 'KPI_EXTENSION', defaultValue: 'true', description: 'Enter true or false if the extension should be executed')
+        string(name: 'KPI_EXTENSION', defaultValue: 'true', description: 'Enter true or false if the extension should be executed')
     }
     
     // here comes the trigger according to crontabs - jenkins is in UTC 
@@ -54,14 +37,6 @@ pipeline {
     environment {
         //ProxySettings
         AUTH = credentials('jaws_dynatrace_bitbuket_user')
-        user = "${AUTH_USR}"
-        pw = "${AUTH_PSW}"
-        //http_proxy="http://${proxy_user}:${proxy_pw}@proxy.muc:8080"
-        //https_proxy="http://${proxy_user}:${proxy_pw}@proxy.muc:8080"
-        //no_proxy="localhost,127.0.0.1,.muc,.bmwgroup.net"
-        //HTTP_PROXY="${http_proxy}"
-        //HTTPS_PROXY="${https_proxy}"
-        //NO_PROXY="${no_proxy}"
         EUPROD_TOKEN_VAR = credentials('EUPROD_TOKEN_VAR')
         EUPREPROD_TOKEN_VAR = credentials('EUPREPROD_TOKEN_VAR')
         NAPROD_TOKEN_VAR = credentials('NAPROD_TOKEN_VAR')
@@ -71,8 +46,8 @@ pipeline {
         EUPRODSAAS_TOKEN_VAR = credentials('EUPRODSAAS_TOKEN_VAR')
         FROM_DATE="${params.FROMDATE}"
         TO_DATE="${params.TODATE}"
-        // REPORT_TYPE="${params.PRESELECT}"
-        // KPI_EXTENSION="${params.KPI_EXTENSION}"
+        REPORT_TYPE="${params.PRESELECT}"
+        KPI_EXTENSION="${params.KPI_EXTENSION}"
     }
         
     stages {
@@ -111,7 +86,7 @@ pipeline {
                         }
                         sh """
                         pip3 install -r requirements.txt
-                        pip3 install git+https://${user}:${pw}@atc.bmwgroup.net/bitbucket/scm/opapm/keyrequestparser.git
+                        pip3 install git+https://${AUTH_USR}:${AUTH_PSW}@atc.bmwgroup.net/bitbucket/scm/opapm/keyrequestparser.git
                         """
                     }
                 }
@@ -162,10 +137,10 @@ pipeline {
                             sh "python3 summary.py"
                             summary = readFile('summary.txt').trim()
 
-                            // if (KPI_EXTENSION=='true') {
-                            //     echo "Executing KPI Extension"
-                            //     sh "python3 kpi_extension.py"
-                            // }
+                            if (KPI_EXTENSION=='true') {
+                                echo "Executing KPI Extension"
+                                sh "python3 kpi_extension.py"
+                            }
 
                         }
                     }