diff --git a/src/external/BMWtools/CMakeLists.txt b/src/external/BMWtools/CMakeLists.txt
index a8e9b9cb..c7b49e80 100644
--- a/src/external/BMWtools/CMakeLists.txt
+++ b/src/external/BMWtools/CMakeLists.txt
@@ -45,6 +45,9 @@ target_include_directories(
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )
 
+#--- add compile options for optimization -------------------------------------
+target_compile_options(BMWtools PUBLIC -O3)
+
 #--- add library dependencies -------------------------------------------------
 target_link_libraries(BMWtools ${ROOT_LIBRARIES} cuba)
 
diff --git a/src/external/CMakeLists.txt b/src/external/CMakeLists.txt
index 2b510ec4..fc7dd53c 100644
--- a/src/external/CMakeLists.txt
+++ b/src/external/CMakeLists.txt
@@ -15,6 +15,10 @@ if (BMWlibs)
   add_subdirectory(libZFRelaxation)
 endif (BMWlibs)
 
+if (BNMRlibs)
+  add_subdirectory(libBNMR)
+endif (BNMRlibs)
+
 add_subdirectory(mud)
 add_subdirectory(MusrRoot)
 add_subdirectory(TLemRunHeader)
diff --git a/src/external/MagProximity/CMakeLists.txt b/src/external/MagProximity/CMakeLists.txt
index 8dff6467..024515ed 100644
--- a/src/external/MagProximity/CMakeLists.txt
+++ b/src/external/MagProximity/CMakeLists.txt
@@ -44,6 +44,9 @@ set_target_properties(PMagProximityFitter
     VERSION ${P_MAG_PROXIMITY_FITTER_VERSION}
 )
 
+#--- add compile options for optimization -------------------------------------
+target_compile_options(PMagProximityFitter PUBLIC -O3)
+
 #--- add library dependencies -------------------------------------------------
 target_link_libraries(PMagProximityFitter ${FFTW3_LIBRARY} ${ROOT_LIBRARIES} PUserFcnBase)
 
diff --git a/src/external/MuSR_software/Class_MuSR_PSI/CMakeLists.txt b/src/external/MuSR_software/Class_MuSR_PSI/CMakeLists.txt
index 6822f600..288d30e6 100644
--- a/src/external/MuSR_software/Class_MuSR_PSI/CMakeLists.txt
+++ b/src/external/MuSR_software/Class_MuSR_PSI/CMakeLists.txt
@@ -27,6 +27,9 @@ set_target_properties(Class_MuSR_PSI
     VERSION ${PSIBIN_VERSION}
 )
 
+#--- add compile options for optimization -------------------------------------
+target_compile_options(Class_MuSR_PSI PUBLIC -O3)
+
 #--- install Class_MuSR_PSI solib ---------------------------------------------
 install(TARGETS Class_MuSR_PSI DESTINATION lib)
 
diff --git a/src/external/MusrRoot/CMakeLists.txt b/src/external/MusrRoot/CMakeLists.txt
index 91e1c52a..01e00733 100644
--- a/src/external/MusrRoot/CMakeLists.txt
+++ b/src/external/MusrRoot/CMakeLists.txt
@@ -30,6 +30,9 @@ set_target_properties(TMusrRunHeader
     VERSION ${MUSR_ROOT_VERSION}
 )
 
+#--- add compile options for optimization -------------------------------------
+target_compile_options(TMusrRunHeader PUBLIC -O3)
+
 #--- add library dependencies -------------------------------------------------
 target_link_libraries(TMusrRunHeader ${ROOT_LIBRARIES})
 
diff --git a/src/external/Nonlocal/CMakeLists.txt b/src/external/Nonlocal/CMakeLists.txt
index 815615f4..fc1d4561 100644
--- a/src/external/Nonlocal/CMakeLists.txt
+++ b/src/external/Nonlocal/CMakeLists.txt
@@ -45,6 +45,9 @@ set_target_properties(PNL_PippardFitter
     VERSION ${PNL_PIPPARDFITTER_VERSION}
 )
 
+#--- add compile options for optimization -------------------------------------
+target_compile_options(PNL_PippardFitter PUBLIC -O3)
+
 #--- add library dependencies -------------------------------------------------
 target_link_libraries(PNL_PippardFitter ${FFTW3_LIBRARY} ${ROOT_LIBRARIES} PUserFcnBase)
 
diff --git a/src/external/TLemRunHeader/CMakeLists.txt b/src/external/TLemRunHeader/CMakeLists.txt
index d3bfb436..8e374480 100644
--- a/src/external/TLemRunHeader/CMakeLists.txt
+++ b/src/external/TLemRunHeader/CMakeLists.txt
@@ -36,6 +36,9 @@ target_include_directories(
   TLemRunHeader BEFORE PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )
 
+#--- add compile options for optimization -------------------------------------
+target_compile_options(TLemRunHeader PUBLIC -O3)
+
 #--- add library dependencies -------------------------------------------------
 target_link_libraries(TLemRunHeader ${ROOT_LIBRARIES})
 
diff --git a/src/external/libBNMR/CMakeLists.txt b/src/external/libBNMR/CMakeLists.txt
new file mode 100644
index 00000000..b2c5ff8c
--- /dev/null
+++ b/src/external/libBNMR/CMakeLists.txt
@@ -0,0 +1,56 @@
+# - beta-NMR library ----------------------------------------------------------
+
+#--- generate necessary dictionaries ------------------------------------------
+set(MUSRFIT_INC ${CMAKE_SOURCE_DIR}/src/include)
+
+root_generate_dictionary(
+  TBNMRDict 
+  -I${FFTW3_INCLUDE_DIR} 
+  -I${MUSRFIT_INC}
+  TBNMR.h 
+  LINKDEF TBNMRLinkDef.h
+)
+
+#--- lib creation -------------------------------------------------------------
+add_library(BNMR SHARED
+  TBNMR.cpp
+  TBNMRDict.cxx
+)
+
+#--- make sure that the include directory is found ----------------------------
+target_include_directories(
+  BNMR BEFORE PRIVATE 
+    $<BUILD_INTERFACE:${MUSRFIT_INC}>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+)
+
+#--- set target properties, e.g. version --------------------------------------
+set_target_properties(BNMR
+  PROPERTIES
+    VERSION "1.0.0"
+)
+
+#--- add compile options for optimization -------------------------------------
+target_compile_options(BNMR PUBLIC -O3)
+
+#--- add library dependencies -------------------------------------------------
+target_link_libraries(BNMR ${ROOT_LIBRARIES} PUserFcnBase)
+
+#--- install libBNMR solib ----------------------------------------------------
+install(TARGETS BNMR DESTINATION lib)
+
+#--- install root pcm's and rootmaps ------------------------------------------
+install(
+  FILES ${CMAKE_CURRENT_BINARY_DIR}/libTBNMRDict_rdict.pcm 
+        ${CMAKE_CURRENT_BINARY_DIR}/libTBNMRDict.rootmap
+  DESTINATION lib
+)
+
+#--- install libBNMR header ---------------------------------------------------
+install( 
+  FILES 
+    TBNMR.h
+  DESTINATION 
+    include
+)
+
diff --git a/src/external/libCalcMeanFieldsLEM/CMakeLists.txt b/src/external/libCalcMeanFieldsLEM/CMakeLists.txt
index 0916986b..01e9c58f 100644
--- a/src/external/libCalcMeanFieldsLEM/CMakeLists.txt
+++ b/src/external/libCalcMeanFieldsLEM/CMakeLists.txt
@@ -48,6 +48,9 @@ target_include_directories(
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )
 
+#--- add compile options for optimization -------------------------------------
+target_compile_options(CalcMeanFieldsLEM PUBLIC -O3)
+
 #--- add library dependencies -------------------------------------------------
 target_link_libraries(CalcMeanFieldsLEM 
   ${FFTW3_LIBRARY} ${ROOT_LIBRARIES} BMWtools FitPofB PUserFcnBase
diff --git a/src/external/libFitPofB/classes/CMakeLists.txt b/src/external/libFitPofB/classes/CMakeLists.txt
index c3187dea..e673f369 100644
--- a/src/external/libFitPofB/classes/CMakeLists.txt
+++ b/src/external/libFitPofB/classes/CMakeLists.txt
@@ -79,8 +79,13 @@ target_include_directories(
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>
 )
 
+#--- add compile options for optimization -------------------------------------
+target_compile_options(FitPofB PUBLIC -O3)
+
 #--- add library dependencies -------------------------------------------------
-target_link_libraries(FitPofB ${FFTW3_LIBRARY} ${FFTW3F_LIBRARY} ${ROOT_LIBRARIES} TLemRunHeader PUserFcnBase BMWtools)
+target_link_libraries(FitPofB 
+    ${FFTW3_LIBRARY} ${FFTW3F_LIBRARY} ${ROOT_LIBRARIES} 
+    TLemRunHeader PUserFcnBase BMWtools)
 
 #--- install FitPofB solib ----------------------------------------------------
 install(TARGETS FitPofB DESTINATION lib)
diff --git a/src/external/libGapIntegrals/CMakeLists.txt b/src/external/libGapIntegrals/CMakeLists.txt
index 9009e8ea..8935ab87 100644
--- a/src/external/libGapIntegrals/CMakeLists.txt
+++ b/src/external/libGapIntegrals/CMakeLists.txt
@@ -45,9 +45,13 @@ target_include_directories(
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )
 
+#--- add compile options for optimization -------------------------------------
+target_compile_options(GapIntegrals PUBLIC -O3)
+
 #--- add library dependencies -------------------------------------------------
 target_link_libraries(GapIntegrals 
-  ${GSL_LIBRARIES} ${FFTW3F_LIBRARY} ${ROOT_LIBRARIES} PUserFcnBase cuba BMWtools
+  ${GSL_LIBRARIES} ${FFTW3F_LIBRARY} ${ROOT_LIBRARIES} 
+  PUserFcnBase cuba BMWtools
 )
 
 #--- install LFRelaxation solib -----------------------------------------------
diff --git a/src/external/libLFRelaxation/CMakeLists.txt b/src/external/libLFRelaxation/CMakeLists.txt
index ece9198a..6c4d5504 100644
--- a/src/external/libLFRelaxation/CMakeLists.txt
+++ b/src/external/libLFRelaxation/CMakeLists.txt
@@ -45,8 +45,13 @@ target_include_directories(
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )
 
+#--- add compile options for optimization -------------------------------------
+target_compile_options(LFRelaxation PUBLIC -O3)
+
 #--- add library dependencies -------------------------------------------------
-target_link_libraries(LFRelaxation ${GSL_LIBRARIES} ${FFTW3F_LIBRARY} ${ROOT_LIBRARIES} PUserFcnBase BMWtools) # //as35 cuba lib still missing
+target_link_libraries(LFRelaxation ${GSL_LIBRARIES} ${FFTW3F_LIBRARY} 
+   ${ROOT_LIBRARIES} PUserFcnBase cuba BMWtools
+)
 
 #--- install LFRelaxation solib -----------------------------------------------
 install(TARGETS LFRelaxation DESTINATION lib)
diff --git a/src/external/libPhotoMeissner/classes/CMakeLists.txt b/src/external/libPhotoMeissner/classes/CMakeLists.txt
index f376155d..8d226aeb 100644
--- a/src/external/libPhotoMeissner/classes/CMakeLists.txt
+++ b/src/external/libPhotoMeissner/classes/CMakeLists.txt
@@ -49,8 +49,13 @@ target_include_directories(
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>
 )
 
+#--- add compile options for optimization -------------------------------------
+target_compile_options(PPhotoMeissner PUBLIC -O3)
+
 #--- add library dependencies -------------------------------------------------
-target_link_libraries(PPhotoMeissner ${FFTW3_LIBRARY} ${GSL_LIBRARY} ${ROOT_LIBRARIES} PUserFcnBase)
+target_link_libraries(PPhotoMeissner 
+   ${FFTW3_LIBRARY} ${GSL_LIBRARY} ${ROOT_LIBRARIES} PUserFcnBase
+)
 
 #--- install PPhotoMeissner solib ---------------------------------------------
 install(TARGETS PPhotoMeissner DESTINATION lib)
diff --git a/src/external/libSpinValve/classes/CMakeLists.txt b/src/external/libSpinValve/classes/CMakeLists.txt
index 94711cd9..8f3ceaa3 100644
--- a/src/external/libSpinValve/classes/CMakeLists.txt
+++ b/src/external/libSpinValve/classes/CMakeLists.txt
@@ -49,6 +49,9 @@ target_include_directories(
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>
 )
 
+#--- add compile options for optimization -------------------------------------
+target_compile_options(PSpinValve PUBLIC -O3)
+
 #--- add library dependencies -------------------------------------------------
 target_link_libraries(PSpinValve ${FFTW3_LIBRARY} ${ROOT_LIBRARIES} PUserFcnBase)
 
diff --git a/src/external/libZFRelaxation/CMakeLists.txt b/src/external/libZFRelaxation/CMakeLists.txt
index f97d0e7f..77a39917 100644
--- a/src/external/libZFRelaxation/CMakeLists.txt
+++ b/src/external/libZFRelaxation/CMakeLists.txt
@@ -45,8 +45,13 @@ target_include_directories(
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )
 
+#--- add compile options for optimization -------------------------------------
+target_compile_options(ZFRelaxation PUBLIC -O3)
+
 #--- add library dependencies -------------------------------------------------
-target_link_libraries(ZFRelaxation ${FFTW3_LIBRARY} ${ROOT_LIBRARIES} PUserFcnBase BMWtools) 
+target_link_libraries(ZFRelaxation 
+  ${FFTW3_LIBRARY} ${ROOT_LIBRARIES} PUserFcnBase cuba BMWtools
+) 
 
 #--- install ZFRelaxation solib -----------------------------------------------
 install(TARGETS ZFRelaxation DESTINATION lib)
diff --git a/src/external/mud/src/CMakeLists.txt b/src/external/mud/src/CMakeLists.txt
index 8dda07a2..c6dd2ab7 100644
--- a/src/external/mud/src/CMakeLists.txt
+++ b/src/external/mud/src/CMakeLists.txt
@@ -26,6 +26,9 @@ set_target_properties(mud
     VERSION ${MUD_VERSION}
 )
 
+#--- add compile options for optimization -------------------------------------
+target_compile_options(mud PUBLIC -O3)
+
 #--- install mud solib --------------------------------------------------------
 install(TARGETS mud DESTINATION lib) 
 
diff --git a/src/external/nexus/CMakeLists.txt b/src/external/nexus/CMakeLists.txt
index 592576ab..f8d1e02b 100644
--- a/src/external/nexus/CMakeLists.txt
+++ b/src/external/nexus/CMakeLists.txt
@@ -27,6 +27,9 @@ target_include_directories(
   PNeXus BEFORE PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )
 
+#--- add compile options for optimization -------------------------------------
+target_compile_options(PNeXus PUBLIC -O3)
+
 #--- add library dependencies -------------------------------------------------
 target_link_libraries(PNeXus ${NEXUS_LIBRARY})