diff --git a/DEMSystems/DEMSystem/DEMSystem.hpp b/DEMSystems/DEMSystem/DEMSystem.hpp
index 23814d3e..424af8ae 100644
--- a/DEMSystems/DEMSystem/DEMSystem.hpp
+++ b/DEMSystems/DEMSystem/DEMSystem.hpp
@@ -183,4 +183,4 @@ public:
 
 } // pFlow
 
-#endif // __DEMSystem_hpp__
\ No newline at end of file
+#endif // __DEMSystem_hpp__
diff --git a/cmake/preReq.cmake b/cmake/preReq.cmake
index f2461064..0b5d896b 100644
--- a/cmake/preReq.cmake
+++ b/cmake/preReq.cmake
@@ -36,12 +36,12 @@ if(NOT EXISTS "${Kokkos_Source_DIR}/CMakeLists.txt")
     FetchContent_Declare(
         kokkos
         GIT_REPOSITORY https://github.com/kokkos/kokkos.git
-        GIT_TAG 4.3.01
+        GIT_TAG 4.4.01
     )
     
     FetchContent_GetProperties(kokkos)
     if(NOT kokkos_POPULATED)
-        message(STATUS "Kokkos source directory not found. Downloading Kokkos version 4.3.01 ...")
+        message(STATUS "Kokkos source directory not found. Downloading Kokkos version 4.4.1 ...")
         FetchContent_Populate(kokkos)
         set(Kokkos_Source_DIR ${kokkos_SOURCE_DIR})
     endif()
diff --git a/src/Interaction/contactSearch/methods/cellBased/NBS/mapperNBSKernels.cpp b/src/Interaction/contactSearch/methods/cellBased/NBS/mapperNBSKernels.cpp
index 3607b7ec..960cef14 100644
--- a/src/Interaction/contactSearch/methods/cellBased/NBS/mapperNBSKernels.cpp
+++ b/src/Interaction/contactSearch/methods/cellBased/NBS/mapperNBSKernels.cpp
@@ -21,6 +21,7 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 #include "mapperNBSKernels.hpp"
+#include "streams.hpp"
 
 void pFlow::mapperNBSKernels::findPointExtends
 (
@@ -152,7 +153,9 @@ bool pFlow::mapperNBSKernels::buildLists
     const pFlagTypeDevice &flags
 )
 {
+    
     auto aRange = flags.activeRange();
+    
     auto pp = points;
     if(flags.isAllActive() )
     { 
@@ -162,7 +165,7 @@ bool pFlow::mapperNBSKernels::buildLists
             deviceRPolicyStatic(aRange.start(), aRange.end()),
             LAMBDA_HD(uint32 i)
             {               
-                auto ind = searchCell.pointIndex(pp[i]);	
+                auto ind = searchCell.pointIndex(pp[i]);
                 uint32 old = Kokkos::atomic_exchange(&head(ind.x(), ind.y(), ind.z()), i);
                 next[i] = old;
             }
diff --git a/src/phasicFlow/algorithms/algorithmFunctions.hpp b/src/phasicFlow/algorithms/algorithmFunctions.hpp
index 0ce97355..402b11eb 100644
--- a/src/phasicFlow/algorithms/algorithmFunctions.hpp
+++ b/src/phasicFlow/algorithms/algorithmFunctions.hpp
@@ -62,4 +62,4 @@ struct minimum
 
 } 
 
-#endif // __algorithmFunctions_hpp__
\ No newline at end of file
+#endif // __algorithmFunctions_hpp__
diff --git a/src/phasicFlow/algorithms/stdAlgorithms.hpp b/src/phasicFlow/algorithms/stdAlgorithms.hpp
index 94a46804..89341a0a 100644
--- a/src/phasicFlow/algorithms/stdAlgorithms.hpp
+++ b/src/phasicFlow/algorithms/stdAlgorithms.hpp
@@ -240,4 +240,4 @@ void inclusiveScan(Type* first, DestType* dFirst, int32 numElems)
 }
 
 
-#endif //__stdAlgorithms_hpp__
\ No newline at end of file
+#endif //__stdAlgorithms_hpp__
diff --git a/src/phasicFlow/containers/List/List/ListI.hpp b/src/phasicFlow/containers/List/List/ListI.hpp
index c46d3efa..ae262617 100644
--- a/src/phasicFlow/containers/List/List/ListI.hpp
+++ b/src/phasicFlow/containers/List/List/ListI.hpp
@@ -270,4 +270,4 @@ inline pFlow::iIstream& pFlow::operator >>(iIstream& is, List<T>& lst)
 		fatalExit;
 	}
 	return is;
-}
\ No newline at end of file
+}
diff --git a/src/phasicFlow/containers/List/ListPtr/ListPtrI.hpp b/src/phasicFlow/containers/List/ListPtr/ListPtrI.hpp
index 861239de..d8cfa467 100644
--- a/src/phasicFlow/containers/List/ListPtr/ListPtrI.hpp
+++ b/src/phasicFlow/containers/List/ListPtr/ListPtrI.hpp
@@ -320,4 +320,4 @@ void pFlow::ListPtr<T>::clear
 		delete p;
 		list_.erase(pos(i));
 	}
-}
\ No newline at end of file
+}
diff --git a/src/phasicFlow/containers/Map/Map/MapI.hpp b/src/phasicFlow/containers/Map/Map/MapI.hpp
index 7b28efcd..b5fceb61 100644
--- a/src/phasicFlow/containers/Map/Map/MapI.hpp
+++ b/src/phasicFlow/containers/Map/Map/MapI.hpp
@@ -131,4 +131,4 @@ inline iOstream& printKeys(iOstream& os, const int64Map<T> & m)
 	}
 
 	return os;
-}
\ No newline at end of file
+}
diff --git a/src/phasicFlow/containers/span/span.hpp b/src/phasicFlow/containers/span/span.hpp
index 879bcb84..a09c1bda 100644
--- a/src/phasicFlow/containers/span/span.hpp
+++ b/src/phasicFlow/containers/span/span.hpp
@@ -185,4 +185,4 @@ span<const char> charSpan(span<const T> s)
 
 } // pFlow
 
-#endif //__span_hpp__
\ No newline at end of file
+#endif //__span_hpp__
diff --git a/src/phasicFlow/dictionary/fileDictionary.hpp b/src/phasicFlow/dictionary/fileDictionary.hpp
index a74c989e..4515728a 100644
--- a/src/phasicFlow/dictionary/fileDictionary.hpp
+++ b/src/phasicFlow/dictionary/fileDictionary.hpp
@@ -60,4 +60,4 @@ public:
 
 }
 
-#endif //__fileDictionary_hpp__
\ No newline at end of file
+#endif //__fileDictionary_hpp__
diff --git a/src/phasicFlow/repository/IOobject/IOPattern.cpp b/src/phasicFlow/repository/IOobject/IOPattern.cpp
index bc240534..5ebd8dee 100644
--- a/src/phasicFlow/repository/IOobject/IOPattern.cpp
+++ b/src/phasicFlow/repository/IOobject/IOPattern.cpp
@@ -32,4 +32,4 @@ pFlow::IOPattern::IOPattern( IOType iotype)
 pFlow::word pFlow::IOPattern::exeMode()
 {
     return processors::globalRunTypeName();
-}
\ No newline at end of file
+}
diff --git a/src/phasicFlow/repository/Time/timeInfo.hpp b/src/phasicFlow/repository/Time/timeInfo.hpp
index 545f9db7..fc759614 100644
--- a/src/phasicFlow/repository/Time/timeInfo.hpp
+++ b/src/phasicFlow/repository/Time/timeInfo.hpp
@@ -115,4 +115,4 @@ public:
 
 } // namespace pFlow
 
-#endif //__timeInfo__hpp_
\ No newline at end of file
+#endif //__timeInfo__hpp_
diff --git a/src/phasicFlow/repository/repository/repositoryTemplates.cpp b/src/phasicFlow/repository/repository/repositoryTemplates.cpp
index c1525430..46c365af 100644
--- a/src/phasicFlow/repository/repository/repositoryTemplates.cpp
+++ b/src/phasicFlow/repository/repository/repositoryTemplates.cpp
@@ -93,4 +93,4 @@ const T& pFlow::repository::lookupObject(const word& name)const
 		fatalExit;
 		return static_cast<T&>(*iter->second);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/phasicFlow/streams/streams.hpp b/src/phasicFlow/streams/streams.hpp
index e34a28cd..9736cf64 100755
--- a/src/phasicFlow/streams/streams.hpp
+++ b/src/phasicFlow/streams/streams.hpp
@@ -46,4 +46,4 @@ namespace pFlow
 #define ERR pFlow::errReport<<boldChar<<redColor<<"> ERROR\n"<<defaultColor<<redColor<<"  " 
 #define END_ERR defaultColor<<pFlow::endl
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/phasicFlow/types/quadruple/quadrupleFwd.hpp b/src/phasicFlow/types/quadruple/quadrupleFwd.hpp
index 5deee4f5..a614a8b7 100644
--- a/src/phasicFlow/types/quadruple/quadrupleFwd.hpp
+++ b/src/phasicFlow/types/quadruple/quadrupleFwd.hpp
@@ -84,4 +84,4 @@ operator>>(iIstream& str, quadruple<T>& iv);
 
 template<typename T>
 INLINE_FUNCTION_H void
-readIstream(iIstream& str, quadruple<T>& iv);
\ No newline at end of file
+readIstream(iIstream& str, quadruple<T>& iv);
diff --git a/src/phasicFlow/types/quadruple/quadrupleMath.hpp b/src/phasicFlow/types/quadruple/quadrupleMath.hpp
index 96d7164c..347cd84a 100644
--- a/src/phasicFlow/types/quadruple/quadrupleMath.hpp
+++ b/src/phasicFlow/types/quadruple/quadrupleMath.hpp
@@ -91,4 +91,4 @@ pFlow::max(const quadruple<T>& q4)
 }
 
 #undef Q4Func
-#undef Q4Func2
\ No newline at end of file
+#undef Q4Func2
diff --git a/src/phasicFlow/types/triple/tripleFwd.hpp b/src/phasicFlow/types/triple/tripleFwd.hpp
index 90e638c2..8687ef78 100644
--- a/src/phasicFlow/types/triple/tripleFwd.hpp
+++ b/src/phasicFlow/types/triple/tripleFwd.hpp
@@ -112,4 +112,4 @@ operator>>(iIstream& str, triple<T>& iv);
 
 template<typename T>
 inline void
-readIstream(iIstream& str, triple<T>& iv);
\ No newline at end of file
+readIstream(iIstream& str, triple<T>& iv);
diff --git a/src/phasicFlow/types/triple/tripleI.hpp b/src/phasicFlow/types/triple/tripleI.hpp
index 6b630cc2..7d2ed7c1 100644
--- a/src/phasicFlow/types/triple/tripleI.hpp
+++ b/src/phasicFlow/types/triple/tripleI.hpp
@@ -342,4 +342,4 @@ pFlow::equal(const triple<T>& opr1, const triple<T>& opr2)
 {
 	return equal(opr1.x(), opr2.x()) && equal(opr1.y(), opr2.y()) &&
 	       equal(opr1.z(), opr2.z());
-}
\ No newline at end of file
+}
diff --git a/src/phasicFlow/types/types.hpp b/src/phasicFlow/types/types.hpp
index 37587517..771a6b42 100644
--- a/src/phasicFlow/types/types.hpp
+++ b/src/phasicFlow/types/types.hpp
@@ -50,90 +50,6 @@ using realx4 = quadruple<real>;
 
 using realx4x3 = quadruple<realx3>;
 
-/*template<>
-inline word
-triple<int8>::TYPENAME()
-{
-	return "int8x3";
-}
-
-template<>
-inline word
-triple<int32>::TYPENAME()
-{
-	return "int32x3";
-}
-
-template<>
-inline word
-basicTypeName<int64x3>()
-{
-	return "int64x3";
-}
-
-template<>
-inline word
-basicTypeName<uint8x3>()
-{
-	return "uint8x3";
-}
-
-template<>
-inline word
-basicTypeName<uint32x3>()
-{
-	return "uint32x3";
-}
-
-template<>
-inline word
-basicTypeName<uint64x3>()
-{
-	return "unit64x3";
-}
-
-template<>
-inline word
-basicTypeName<realx3>()
-{
-	return "realx3";
-}
-
-template<>
-inline word
-basicTypeName<int32x3x3>()
-{
-	return "int32x3x3";
-}
-
-template<>
-inline word
-basicTypeName<uint32x3x3>()
-{
-	return "uint32x3x3";
-}
-
-template<>
-inline word
-basicTypeName<realx3x3>()
-{
-	return "realx3x3";
-}
-
-template<>
-inline word
-basicTypeName<realx4>()
-{
-	return "realx4";
-}
-
-template<>
-inline word
-basicTypeName<realx4x3>()
-{
-	return "realx4x3";
-}*/
-
 extern const realx3   zero3;
 extern const realx3   one3;
 
@@ -144,4 +60,4 @@ extern const realx4   zero4;
 
 } // pFlow
 
-#endif //__types_hpp__
\ No newline at end of file
+#endif //__types_hpp__