diff --git a/reducedStartupTime/setup.sh b/reducedStartupTime/setup.sh
index e88df7b..72f88c6 100644
--- a/reducedStartupTime/setup.sh
+++ b/reducedStartupTime/setup.sh
@@ -182,6 +182,19 @@ checkEnvSubstituteConfig()
 			print_Debug "set BW_APPLICATION_JOB_FLOWLIMIT to $BW_APPLICATION_JOB_FLOWLIMIT"
 		fi
 	fi
+	if [[ ${BW_COMPONENT_JOB_FLOWLIMIT} ]]; then
+		if [ -e ${appnodeConfigFile} ]; then
+			IFS=';' # space is set as delimiter
+			read -ra processConfigurationList <<< "${BW_COMPONENT_JOB_FLOWLIMIT}" # str is read into an array as tokens separated by IFS
+			for process in "${processConfigurationList[@]}"; do # access each element of array
+				echo "Setting flow limit for $process"
+				IFS=':' # space is set as delimiter
+				read -ra processConfiguration <<< "$process" # str is read into an array as tokens separated by IFS
+				printf '%s\n' "bw.application.job.flowlimit.$bwBundleAppName.${processConfiguration[0]}=${processConfiguration[1]}" >> $appnodeConfigFile
+				print_Debug "set bw.application.job.flowlimit.$bwBundleAppName.${processConfiguration[0]} to ${processConfiguration[1]}"
+			done			
+		fi
+	fi
 	if [[ ${BW_APP_MONITORING_CONFIG} ]]; then
 		if [ -e ${appnodeConfigFile} ]; then
 			sed -i 's/bw.frwk.event.subscriber.metrics.enabled=false/bw.frwk.event.subscriber.metrics.enabled=true/g' $appnodeConfigFile
@@ -289,9 +302,33 @@ done
 
 memoryCalculator()
 {
-	if [[ ${MEMORY_LIMIT} ]]; then
-		memory_Number=`echo $MEMORY_LIMIT | sed 's/m$//I'`
-		configured_MEM=$((($memory_Number*67+50)/100))
+	if [[ ${MEMORY_LIMIT} ]]; then		
+
+		configured_MEM=$(expr `cat /sys/fs/cgroup/memory/memory.limit_in_bytes` / 1024 / 1024)
+		configured_MEM_orig=$configured_MEM
+
+		if [[ ${MEMORY_DYNAMIC_LIMIT} ]]; then			
+			sys_MEM=$(expr $configured_MEM \* ${MEMORY_DYNAMIC_LIMIT} / 100)
+			system_MEM=`printf "%.0f" $sys_MEM`
+			configured_MEM_temp=$(expr $configured_MEM - $system_MEM)
+			if [[  $configured_MEM_temp -gt 128 ]]; then
+				configured_MEM=$configured_MEM_temp
+			fi
+		elif [[ ${MEMORY_FIXED_LIMIT} ]]; then		
+			configured_MEM_temp=$(expr $configured_MEM - ${MEMORY_FIXED_LIMIT} )
+			if [[  $configured_MEM_temp -gt 128 ]]; then
+				configured_MEM=$configured_MEM_temp
+			fi
+		fi
+
+		if 	[[ $configured_MEM -eq $configured_MEM_orig ]]; then
+			configured_MEM_temp=$(expr $configured_MEM - 128)
+			if [[  $configured_MEM_temp -gt 128 ]]; then
+				configured_MEM=$configured_MEM_temp
+			fi
+		fi
+
+		print_Debug "Maximum memory calculated in a dynamic way to a value [$configured_MEM]"
 		thread_Stack=$((memory_Number))
 		JAVA_PARAM="-Xmx"$configured_MEM"M -Xms128M -Xss512K"
 		export BW_JAVA_OPTS=$JAVA_PARAM" "$BW_JAVA_OPTS
diff --git a/scripts/setup.sh b/scripts/setup.sh
index af0da6a..d23ba21 100755
--- a/scripts/setup.sh
+++ b/scripts/setup.sh
@@ -182,6 +182,19 @@ checkEnvSubstituteConfig()
 			print_Debug "set BW_APPLICATION_JOB_FLOWLIMIT to $BW_APPLICATION_JOB_FLOWLIMIT"
 		fi
 	fi
+	if [[ ${BW_COMPONENT_JOB_FLOWLIMIT} ]]; then
+		if [ -e ${appnodeConfigFile} ]; then
+			IFS=';' # space is set as delimiter
+			read -ra processConfigurationList <<< "${BW_COMPONENT_JOB_FLOWLIMIT}" # str is read into an array as tokens separated by IFS
+			for process in "${processConfigurationList[@]}"; do # access each element of array
+				echo "Setting flow limit for $process"
+				IFS=':' # space is set as delimiter
+				read -ra processConfiguration <<< "$process" # str is read into an array as tokens separated by IFS
+				printf '%s\n' "bw.application.job.flowlimit.$bwBundleAppName.${processConfiguration[0]}=${processConfiguration[1]}" >> $appnodeConfigFile
+				print_Debug "set bw.application.job.flowlimit.$bwBundleAppName.${processConfiguration[0]} to ${processConfiguration[1]}"
+			done			
+		fi
+	fi
 	if [[ ${BW_APP_MONITORING_CONFIG} ]]; then
 		if [ -e ${appnodeConfigFile} ]; then
 			sed -i 's/bw.frwk.event.subscriber.metrics.enabled=false/bw.frwk.event.subscriber.metrics.enabled=true/g' $appnodeConfigFile
@@ -289,13 +302,37 @@ done
 
 memoryCalculator()
 {
-	if [[ ${MEMORY_LIMIT} ]]; then
-		memory_Number=`echo $MEMORY_LIMIT | sed 's/m$//I'`
-		configured_MEM=$((($memory_Number*67+50)/100))
+	if [[ ${MEMORY_LIMIT} ]]; then		
+
+		configured_MEM=$(expr `cat /sys/fs/cgroup/memory/memory.limit_in_bytes` / 1024 / 1024)
+		configured_MEM_orig=$configured_MEM
+
+		if [[ ${MEMORY_DYNAMIC_LIMIT} ]]; then			
+			sys_MEM=$(expr $configured_MEM \* ${MEMORY_DYNAMIC_LIMIT} / 100)
+			system_MEM=`printf "%.0f" $sys_MEM`
+			configured_MEM_temp=$(expr $configured_MEM - $system_MEM)
+			if [[  $configured_MEM_temp -gt 128 ]]; then
+				configured_MEM=$configured_MEM_temp
+			fi
+		elif [[ ${MEMORY_FIXED_LIMIT} ]]; then		
+			configured_MEM_temp=$(expr $configured_MEM - ${MEMORY_FIXED_LIMIT} )
+			if [[  $configured_MEM_temp -gt 128 ]]; then
+				configured_MEM=$configured_MEM_temp
+			fi
+		fi
+
+		if 	[[ $configured_MEM -eq $configured_MEM_orig ]]; then
+			configured_MEM_temp=$(expr $configured_MEM - 128)
+			if [[  $configured_MEM_temp -gt 128 ]]; then
+				configured_MEM=$configured_MEM_temp
+			fi
+		fi
+
+		print_Debug "Maximum memory calculated in a dynamic way to a value [$configured_MEM]"
 		thread_Stack=$((memory_Number))
 		JAVA_PARAM="-Xmx"$configured_MEM"M -Xms128M -Xss512K"
 		export BW_JAVA_OPTS=$JAVA_PARAM" "$BW_JAVA_OPTS
-	fi	
+	fi
 }
 
 applyDefaultJVMHeapParams(){