diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3d35d7436b557b6224970f302b4b0a7c7b5674ef..9b4fde456456f63f96d78f432495f56e6caa7e11 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -105,8 +105,10 @@ ELSE(MSVC)
   SET( CMAKE_CXX_FLAGS "-include ${CMAKE_BINARY_DIR}/VirtualFluidsDefinitions.h ${CMAKE_CXX_FLAGS}" )
 ENDIF(MSVC)
 
-# only use this with device of CC larger than 6.0
-set(CMAKE_CUDA_FLAGS " -arch=sm_60" CACHE STRING "" FORCE)
+IF( VF.BUILD_VF_GKS )
+  # only use this with device of CC larger than 6.0
+  set(CMAKE_CUDA_FLAGS " -arch=sm_60" CACHE STRING "" FORCE)
+ENDIF()
 
 set(CMAKE_CUDA_FLAGS_DEBUG " -G" CACHE STRING "" FORCE)
 
diff --git a/MachineFiles/ELENDUR b/MachineFiles/ELENDUR
new file mode 100644
index 0000000000000000000000000000000000000000..3b7fee44316a6084d5c8d22175a74b671670f9c0
--- /dev/null
+++ b/MachineFiles/ELENDUR
@@ -0,0 +1,12 @@
+#Don't change:
+SET(METIS_ROOT ${CMAKE_SOURCE_DIR}/3rdParty/metis/metis-5.1.0 CACHE PATH "METIS ROOT")
+SET(GMOCK_ROOT ${CMAKE_SOURCE_DIR}/3rdParty/googletest CACHE PATH "GMOCK ROOT")
+SET(JSONCPP_ROOT ${CMAKE_SOURCE_DIR}/3rdParty/jsoncpp CACHE PATH "JSONCPP ROOT")
+SET(FFTW_ROOT ${CMAKE_SOURCE_DIR}/3rdParty/fftw/fftw-3.3.7 CACHE PATH "JSONCPP ROOT")
+
+
+#SET TO CORRECT PATH:
+SET(BOOST_ROOT  "D:\\boost_1_65_1"  CACHE PATH "BOOST_ROOT")
+SET(BOOST_LIBRARYDIR  "D:\\boost_1_65_1\\stageMSVC64\\lib" CACHE PATH "BOOST_LIBRARYDIR")
+
+SET(VTK_DIR "D:/VTK-8.2.0/bin" CACHE PATH "VTK directory override" FORCE)
diff --git a/src/Core/DataTypes.h b/src/Core/DataTypes.h
index 0b7cd94ba1051763e4b304891248c55751dc89ec..b65f3344c2788ee3e2af04bf3b2813f5a055c52d 100644
--- a/src/Core/DataTypes.h
+++ b/src/Core/DataTypes.h
@@ -1,6 +1,8 @@
 #ifndef DATATYPES_H
 #define DATATYPES_H
 
+#include <string>
+
 #include "VirtualFluidsDefinitions.h"
 
 #ifdef VF_DOUBLE_ACCURACY
diff --git a/src/GridGenerator/StreetPointFinder/StreetPointFinder.h b/src/GridGenerator/StreetPointFinder/StreetPointFinder.h
index a4b0b22e6feb9fdf0b417bd770c2d07310b96f3a..b90840b8e63df48d0224b2a8a3227f3a3616dccd 100644
--- a/src/GridGenerator/StreetPointFinder/StreetPointFinder.h
+++ b/src/GridGenerator/StreetPointFinder/StreetPointFinder.h
@@ -2,6 +2,7 @@
 #define StreetPointFinder_H
 
 #include <vector>
+#include <string>
 
 #include "Core/PointerDefinitions.h"
 #include "Core/DataTypes.h"
diff --git a/src/VirtualFluids_GPU/Kernel/Utilities/Mapper/ADKernelMapper/ADKernelMapper.h b/src/VirtualFluids_GPU/Kernel/Utilities/Mapper/ADKernelMapper/ADKernelMapper.h
index f33453770dba779a1c64ba6b6385cd9f8b029ce0..b6a75a573090f4703e68a4d3ff6829458eb3a950 100644
--- a/src/VirtualFluids_GPU/Kernel/Utilities/Mapper/ADKernelMapper/ADKernelMapper.h
+++ b/src/VirtualFluids_GPU/Kernel/Utilities/Mapper/ADKernelMapper/ADKernelMapper.h
@@ -5,6 +5,7 @@
 #include "Kernel//Utilities/KernelType.h"
 
 #include <memory>
+#include <string>
 
 class VF_PUBLIC ADKernelMapper
 {
diff --git a/src/VirtualFluids_GPU/Kernel/Utilities/Mapper/KernelMapper/KernelMapper.h b/src/VirtualFluids_GPU/Kernel/Utilities/Mapper/KernelMapper/KernelMapper.h
index dc413f63b1782e75535d4d5caf215e98db7d8735..b9b1ec5fd8342744b736a246ad9401fb822578fd 100644
--- a/src/VirtualFluids_GPU/Kernel/Utilities/Mapper/KernelMapper/KernelMapper.h
+++ b/src/VirtualFluids_GPU/Kernel/Utilities/Mapper/KernelMapper/KernelMapper.h
@@ -5,6 +5,7 @@
 #include "Kernel//Utilities/KernelType.h"
 
 #include <memory>
+#include <string>
 
 class VF_PUBLIC KernelMapper
 {
diff --git a/src/VirtualFluids_GPU/LBM/Simulation.cpp b/src/VirtualFluids_GPU/LBM/Simulation.cpp
index c5528a14bcc66175d41b2e0290a75ab9306fbd8a..a342bacfc07c8a7e13456ac624e048898507f5a1 100644
--- a/src/VirtualFluids_GPU/LBM/Simulation.cpp
+++ b/src/VirtualFluids_GPU/LBM/Simulation.cpp
@@ -168,7 +168,6 @@ void Simulation::init(SPtr<Parameter> para, SPtr<GridProvider> gridProvider, std
    std::vector<PreProcessorType> preProTypes = kernels.at(0)->getPreProcessorTypes();
    preProcessor = preProcessorFactory->makePreProcessor(preProTypes, para);
 
-
    //////////////////////////////////////////////////////////////////////////
    //Particles preprocessing
    //////////////////////////////////////////////////////////////////////////
@@ -212,9 +211,9 @@ void Simulation::init(SPtr<Parameter> para, SPtr<GridProvider> gridProvider, std
    //////////////////////////////////////////////////////////////////////////
    //Median
    //////////////////////////////////////////////////////////////////////////
-   output << "alloc Calculation for Mean Valus  " << "\n";
    if (para->getCalcMedian())
    {
+       output << "alloc Calculation for Mean Valus  " << "\n";
 	   if (para->getDiffOn())	allocMedianAD(para.get(), cudaManager.get());
 	   else						allocMedian(para.get(), cudaManager.get());
    }
diff --git a/src/VirtualFluids_GPU/Output/DataWriter.h b/src/VirtualFluids_GPU/Output/DataWriter.h
index b1972f00c6b60caeacffd02303185c5c81d31a96..a7d3a26fb1aa578c8f8b40df77172470f339d98b 100644
--- a/src/VirtualFluids_GPU/Output/DataWriter.h
+++ b/src/VirtualFluids_GPU/Output/DataWriter.h
@@ -4,6 +4,7 @@
 
 #include <memory>
 #include <vector>
+#include <string>
 
 
 class Parameter;
diff --git a/src/VirtualFluids_GPU/Utilities/EnumMapper/EnumMapperImp.h b/src/VirtualFluids_GPU/Utilities/EnumMapper/EnumMapperImp.h
index 0fb7bbf1f8633b7343a331cac10d806316107f1b..72fb1462fa48376c97290c12fa1d65dbb26d0f18 100644
--- a/src/VirtualFluids_GPU/Utilities/EnumMapper/EnumMapperImp.h
+++ b/src/VirtualFluids_GPU/Utilities/EnumMapper/EnumMapperImp.h
@@ -2,6 +2,7 @@
 #define ENUM_MAPPER_IMP_H
 
 #include <map>
+#include <string>
 
 template <typename T>