diff --git a/NPLib/CMakeLists.txt b/NPLib/CMakeLists.txt
index e4d38fb00d20c971d64c6cf230f9fca567f1d575..0d550ea6cb098fc4472dd68548b06e9a85798bb3 100644
--- a/NPLib/CMakeLists.txt
+++ b/NPLib/CMakeLists.txt
@@ -9,7 +9,6 @@ cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
 # include the nptool standard CMake preamble 
 include("ressources/CMake/NPTool_CMake_Preamble.cmake")
 
-
 # Major change in the Core/Physics (affecting the detector/analysis/simulation)
 set(NPLIB_VERSION_MAJOR 2)
 # Minor change in the Core/Physics (not affecting any other part)
diff --git a/NPLib/ressources/CMake/NPTool_CMake_Preamble.cmake b/NPLib/ressources/CMake/NPTool_CMake_Preamble.cmake
index 6383ff35a0f195e7d0e2f53b681b6071287b4ab5..3589e9dd88e0d6c59829194896709c40e98c47db 100644
--- a/NPLib/ressources/CMake/NPTool_CMake_Preamble.cmake
+++ b/NPLib/ressources/CMake/NPTool_CMake_Preamble.cmake
@@ -13,6 +13,12 @@ cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
 # This suppress the Up-to-Date message of file installed for cmake 3.1 and above
 set(CMAKE_INSTALL_MESSAGE LAZY) 
 
+# Set the Search path for library
+SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+
+# set NPLib/lib as one of the link directory
+link_directories(${NPTOOL_LIB_DIR})
+
 # Check for user disabling of c++11 support
 string(COMPARE EQUAL "${CPP11}" "no" nocpp11)
 if(nocpp11)
diff --git a/NPSimulation/Detectors/AGATA/CMakeLists.txt b/NPSimulation/Detectors/AGATA/CMakeLists.txt
index d1e57aaaf653501da1055c685f597cb71a5f09e1..2d92b07a6cda705e2eb0d9d9bb5edff436e2582e 100644
--- a/NPSimulation/Detectors/AGATA/CMakeLists.txt
+++ b/NPSimulation/Detectors/AGATA/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Check for gdml support
 if(Geant4_gdml_FOUND)  
 add_library(NPSAGATA SHARED  AGATA.cc)
-target_link_libraries(NPSAGATA NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} ${NPLib_LIBRARIES} -lNPAGATA)
+target_link_libraries(NPSAGATA NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} NPAGATA)
 endif()
diff --git a/NPSimulation/Detectors/AnnularS1/CMakeLists.txt b/NPSimulation/Detectors/AnnularS1/CMakeLists.txt
index d92dba83390abf5d2f9cc4b030abebd28289d87a..7b4e4318b56b85f709e5104f9a5ac7d7532175a7 100644
--- a/NPSimulation/Detectors/AnnularS1/CMakeLists.txt
+++ b/NPSimulation/Detectors/AnnularS1/CMakeLists.txt
@@ -1,2 +1,2 @@
 add_library(NPSAnnularS1 SHARED  AnnularS1.cc)
-target_link_libraries(NPSAnnularS1 NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} ${NPLib_LIBRARIES} -lNPAnnularS1)
+target_link_libraries(NPSAnnularS1 NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} NPAnnularS1)
diff --git a/NPSimulation/Detectors/ComptonTelescope/CMakeLists.txt b/NPSimulation/Detectors/ComptonTelescope/CMakeLists.txt
index d48945290d063a076c2a0cfb855cadd4de59a3df..08c4db528476b15f1f5f128ba4c34f306b4e7a5d 100644
--- a/NPSimulation/Detectors/ComptonTelescope/CMakeLists.txt
+++ b/NPSimulation/Detectors/ComptonTelescope/CMakeLists.txt
@@ -1,2 +1,2 @@
 add_library(NPSComptonTelescope SHARED  ComptonTelescope.cc ComptonTelescopeScorers.cc)
-target_link_libraries(NPSComptonTelescope NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} ${NPLib_LIBRARIES} -lNPComptonTelescope)
+target_link_libraries(NPSComptonTelescope NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} NPComptonTelescope)
diff --git a/NPSimulation/Detectors/CsI/CMakeLists.txt b/NPSimulation/Detectors/CsI/CMakeLists.txt
index 9d266067a33ddd833b2507e33c60c147569383ec..f9b862abbf7786415bea885262cd957f366ff31c 100644
--- a/NPSimulation/Detectors/CsI/CMakeLists.txt
+++ b/NPSimulation/Detectors/CsI/CMakeLists.txt
@@ -1,2 +1,2 @@
 add_library(NPSCsI SHARED  CsI.cc)
-target_link_libraries(NPSCsI NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} ${NPLib_LIBRARIES} -lNPCsI)
+target_link_libraries(NPSCsI NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} NPCsI)
diff --git a/NPSimulation/Detectors/Eurogam/CMakeLists.txt b/NPSimulation/Detectors/Eurogam/CMakeLists.txt
index 33f2e2ef962cfe68321f26ccfac98c0a810e145b..d555248460cc8c9e6b41693403a64256915daed5 100644
--- a/NPSimulation/Detectors/Eurogam/CMakeLists.txt
+++ b/NPSimulation/Detectors/Eurogam/CMakeLists.txt
@@ -1,2 +1,2 @@
 add_library(NPSEurogam SHARED  Eurogam.cc)
-target_link_libraries(NPSEurogam NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} ${NPLib_LIBRARIES} -lNPEurogam)
+target_link_libraries(NPSEurogam NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} NPEurogam)
diff --git a/NPSimulation/Detectors/FPDTamu/CMakeLists.txt b/NPSimulation/Detectors/FPDTamu/CMakeLists.txt
index efdea8820308ac862a2002461a473019ca1d9c83..1c707e9b1637d1a8c064c6fd510e5608e09d8a4c 100644
--- a/NPSimulation/Detectors/FPDTamu/CMakeLists.txt
+++ b/NPSimulation/Detectors/FPDTamu/CMakeLists.txt
@@ -1,2 +1,2 @@
 add_library(NPSFPDTamu SHARED  FPDTamu.cc)
-target_link_libraries(NPSFPDTamu NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} ${NPLib_LIBRARIES} -lNPFPDTamu)
+target_link_libraries(NPSFPDTamu NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} NPFPDTamu)
diff --git a/NPSimulation/Detectors/Fatima/CMakeLists.txt b/NPSimulation/Detectors/Fatima/CMakeLists.txt
index 64db645896b7f8af95b017269dcfacf5f5ec7990..91f9fe0d500362daa03d27cf3fa398e57dfb845c 100644
--- a/NPSimulation/Detectors/Fatima/CMakeLists.txt
+++ b/NPSimulation/Detectors/Fatima/CMakeLists.txt
@@ -1,2 +1,2 @@
 add_library(NPSFatima SHARED  Fatima.cc)
-target_link_libraries(NPSFatima NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} ${NPLib_LIBRARIES} -lNPFatima)
+target_link_libraries(NPSFatima NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} NPFatima)
diff --git a/NPSimulation/Detectors/GASPARD/CMakeLists.txt b/NPSimulation/Detectors/GASPARD/CMakeLists.txt
index 4799f4f45fc9dea1c28b9895492192b89e6be0c1..d4a4e0c4f32d5de2eacccf9f024a9d9d41d2beda 100644
--- a/NPSimulation/Detectors/GASPARD/CMakeLists.txt
+++ b/NPSimulation/Detectors/GASPARD/CMakeLists.txt
@@ -1,2 +1,2 @@
 add_library(NPSGASPARD SHARED  GaspardScorers.cc GaspardTracker.cc GaspardTrackerAnnular.cc GaspardTrackerDummyShape.cc GaspardTrackerModule.cc GaspardTrackerRectangle.cc GaspardTrackerSquare.cc GaspardTrackerTrapezoid.cc)
-target_link_libraries(NPSGASPARD NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} ${NPLib_LIBRARIES} -lNPGASPARD)
+target_link_libraries(NPSGASPARD NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} NPGASPARD)
diff --git a/NPSimulation/Detectors/GeTAMU/CMakeLists.txt b/NPSimulation/Detectors/GeTAMU/CMakeLists.txt
index 8dca6410672fbf7db864b5a1c91a9fbfbbae5d97..8463443666407274f91a7f33f762d1eac3188a03 100644
--- a/NPSimulation/Detectors/GeTAMU/CMakeLists.txt
+++ b/NPSimulation/Detectors/GeTAMU/CMakeLists.txt
@@ -1,2 +1,2 @@
 add_library(NPSGeTAMU SHARED  GeTAMU.cc )
-target_link_libraries(NPSGeTAMU NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} ${NPLib_LIBRARIES} -lNPGeTAMU)
+target_link_libraries(NPSGeTAMU NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} NPGeTAMU)
diff --git a/NPSimulation/Detectors/Helios/CMakeLists.txt b/NPSimulation/Detectors/Helios/CMakeLists.txt
index 6928bf3e55672a43ab4a04c70fecaaaf55de873b..487bf390a43c46dfcc5cbbed28fac2ce8a00c15b 100644
--- a/NPSimulation/Detectors/Helios/CMakeLists.txt
+++ b/NPSimulation/Detectors/Helios/CMakeLists.txt
@@ -1,2 +1,2 @@
 add_library(NPSHelios SHARED  Helios.cc HeliosDetDummyShape.cc HeliosModule.cc HeliosScorers.cc)
-target_link_libraries(NPSHelios NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} ${NPLib_LIBRARIES} -lNPHelios)
+target_link_libraries(NPSHelios NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} NPHelios)
diff --git a/NPSimulation/Detectors/Helios2/CMakeLists.txt b/NPSimulation/Detectors/Helios2/CMakeLists.txt
index 8118e68cab26234356aa969e2313671c23588ece..be643a240000abbfa578521714afe94b5a4442ec 100644
--- a/NPSimulation/Detectors/Helios2/CMakeLists.txt
+++ b/NPSimulation/Detectors/Helios2/CMakeLists.txt
@@ -1,2 +1,2 @@
 add_library(NPSHelios2 SHARED  Helios2.cc)
-target_link_libraries(NPSHelios2 NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} ${NPLib_LIBRARIES} -lNPHelios2)
+target_link_libraries(NPSHelios2 NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} NPHelios2)
diff --git a/NPSimulation/Detectors/Hira/CMakeLists.txt b/NPSimulation/Detectors/Hira/CMakeLists.txt
index 2d325b9fa003f55510b4f9802b5094bf7d0db4cc..a2f53fd2d4344e508ec5219bc62c4706feed74a3 100644
--- a/NPSimulation/Detectors/Hira/CMakeLists.txt
+++ b/NPSimulation/Detectors/Hira/CMakeLists.txt
@@ -1,2 +1,2 @@
 add_library(NPSHira SHARED  Hira.cc)
-target_link_libraries(NPSHira NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} ${NPLib_LIBRARIES} -lNPHira)
+target_link_libraries(NPSHira NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} NPHira)
diff --git a/NPSimulation/Detectors/Hyde2/CMakeLists.txt b/NPSimulation/Detectors/Hyde2/CMakeLists.txt
index 6054006866f78481139481c9f529e0b6d83154b9..78c1c91f3874a0e376cf758602f8afd795b4ea1c 100644
--- a/NPSimulation/Detectors/Hyde2/CMakeLists.txt
+++ b/NPSimulation/Detectors/Hyde2/CMakeLists.txt
@@ -1,2 +1,2 @@
 add_library(NPSHyde2 SHARED  Hyde2Scorers.cc Hyde2Tracker.cc Hyde2TrackerModule.cc Hyde2TrackerSquare1.cc Hyde2TrackerTrapezoid1.cc Hyde2TrackerTrapezoid2.cc)
-target_link_libraries(NPSHyde2 NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} ${NPLib_LIBRARIES} -lNPHYDE2)
+target_link_libraries(NPSHyde2 NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} NPHYDE2)
diff --git a/NPSimulation/Detectors/Lassa/CMakeLists.txt b/NPSimulation/Detectors/Lassa/CMakeLists.txt
index 179d211e9de770b8d2bd5b7954e73130d08cca02..b1e6c5f955239c05729cf9b59cbf43221e1200d4 100644
--- a/NPSimulation/Detectors/Lassa/CMakeLists.txt
+++ b/NPSimulation/Detectors/Lassa/CMakeLists.txt
@@ -1,2 +1,2 @@
 add_library(NPSLassa SHARED  Lassa.cc)
-target_link_libraries(NPSLassa NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} ${NPLib_LIBRARIES} -lNPLassa)
+target_link_libraries(NPSLassa NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} NPLassa)
diff --git a/NPSimulation/Detectors/MUST2/CMakeLists.txt b/NPSimulation/Detectors/MUST2/CMakeLists.txt
index 575f80c78eafba3c754d20d676dc7e689cd7cca1..3a3bbb8122b303daeafbf40a2f9e4af9b57a5ff0 100644
--- a/NPSimulation/Detectors/MUST2/CMakeLists.txt
+++ b/NPSimulation/Detectors/MUST2/CMakeLists.txt
@@ -1,2 +1,2 @@
 add_library(NPSMUST2 SHARED  MUST2Array.cc MUST2Scorers.cc)
-target_link_libraries(NPSMUST2 NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} ${NPLib_LIBRARIES} -lNPMUST2)
+target_link_libraries(NPSMUST2 NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} NPMUST2)
diff --git a/NPSimulation/Detectors/Microball/CMakeLists.txt b/NPSimulation/Detectors/Microball/CMakeLists.txt
index e6671135ee25002a34a73d44b0e0b6acb1923bd0..57ec8665abda473b28d2f0f47a7c8793ce5a1878 100644
--- a/NPSimulation/Detectors/Microball/CMakeLists.txt
+++ b/NPSimulation/Detectors/Microball/CMakeLists.txt
@@ -1,2 +1,2 @@
 add_library(NPSMicroball SHARED  Microball.cc)
-target_link_libraries(NPSMicroball NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} ${NPLib_LIBRARIES} -lNPMicroball)
+target_link_libraries(NPSMicroball NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} NPMicroball)
diff --git a/NPSimulation/Detectors/Miniball/CMakeLists.txt b/NPSimulation/Detectors/Miniball/CMakeLists.txt
index b10ddc4e14dd1ac41159d89dac632ef1ca0f2a67..b1a1001490ad26d6bcc3d2c9769eafa31b9a6a2c 100644
--- a/NPSimulation/Detectors/Miniball/CMakeLists.txt
+++ b/NPSimulation/Detectors/Miniball/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Check for gdml support
 if(Geant4_gdml_FOUND)  
 add_library(NPSMiniball SHARED  Miniball.cc)
-target_link_libraries(NPSMiniball NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} ${NPLib_LIBRARIES} -lNPMiniball)
+target_link_libraries(NPSMiniball NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} NPMiniball)
 endif()
diff --git a/NPSimulation/Detectors/Nana/CMakeLists.txt b/NPSimulation/Detectors/Nana/CMakeLists.txt
index 9eaa1f6ef4ceca3bf78d5fe9c8262269c1992a89..76107e6ccc9a0a88ae45a119a1cb8b2c839bcf5f 100644
--- a/NPSimulation/Detectors/Nana/CMakeLists.txt
+++ b/NPSimulation/Detectors/Nana/CMakeLists.txt
@@ -1,2 +1,2 @@
 add_library(NPSNana SHARED  Nana.cc)
-target_link_libraries(NPSNana NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} ${NPLib_LIBRARIES} -lNPNana)
+target_link_libraries(NPSNana NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} NPNana)
diff --git a/NPSimulation/Detectors/NeutronWall/CMakeLists.txt b/NPSimulation/Detectors/NeutronWall/CMakeLists.txt
index e0dcd1fbeff378d86db646a8cfc84704920f8fb6..dd4b536c4bc49083f8cb9f277fa2908446de3e29 100644
--- a/NPSimulation/Detectors/NeutronWall/CMakeLists.txt
+++ b/NPSimulation/Detectors/NeutronWall/CMakeLists.txt
@@ -1,2 +1,2 @@
 add_library(NPSNeutronWall SHARED  NeutronWall.cc)
-target_link_libraries(NPSNeutronWall NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} ${NPLib_LIBRARIES} -lNPNeutronWall)
+target_link_libraries(NPSNeutronWall NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} NPNeutronWall)
diff --git a/NPSimulation/Detectors/Paris/CMakeLists.txt b/NPSimulation/Detectors/Paris/CMakeLists.txt
index 618fde020efe606fc43407250c1a9d2f8e99f8d0..762aecbf2eaff9679016c7d3adc0df2e72c5f0de 100644
--- a/NPSimulation/Detectors/Paris/CMakeLists.txt
+++ b/NPSimulation/Detectors/Paris/CMakeLists.txt
@@ -1,2 +1,2 @@
 add_library(NPSParis SHARED  Paris.cc)
-target_link_libraries(NPSParis NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} ${NPLib_LIBRARIES} -lNPParis)
+target_link_libraries(NPSParis NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} NPParis)
diff --git a/NPSimulation/Detectors/Plastic/CMakeLists.txt b/NPSimulation/Detectors/Plastic/CMakeLists.txt
index d7994b4e9a1e2aecc90c362f28a5ea0458ddaf12..b34ff69c104d56e2f9e2afcabfa1ea6983aaa717 100644
--- a/NPSimulation/Detectors/Plastic/CMakeLists.txt
+++ b/NPSimulation/Detectors/Plastic/CMakeLists.txt
@@ -1,2 +1,2 @@
 add_library(NPSPlastic SHARED  Plastic.cc)
-target_link_libraries(NPSPlastic NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} ${NPLib_LIBRARIES} -lNPPlastic)
+target_link_libraries(NPSPlastic NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} NPPlastic)
diff --git a/NPSimulation/Detectors/QQQ/CMakeLists.txt b/NPSimulation/Detectors/QQQ/CMakeLists.txt
index 87313bebd3103e57fd73a163209a5ee1b047fce0..c979e23e60bfd210e06e66b5ed337910e3e89e7c 100644
--- a/NPSimulation/Detectors/QQQ/CMakeLists.txt
+++ b/NPSimulation/Detectors/QQQ/CMakeLists.txt
@@ -1,2 +1,2 @@
 add_library(NPSQQQ SHARED  QQQ.cc)
-target_link_libraries(NPSQQQ NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} ${NPLib_LIBRARIES} -lNPQQQ)
+target_link_libraries(NPSQQQ NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} NPQQQ)
diff --git a/NPSimulation/Detectors/SSSD/CMakeLists.txt b/NPSimulation/Detectors/SSSD/CMakeLists.txt
index ca38832e559aeb1b151aa7e67f7ca1b9d6944ac9..c8977eea93da7bbca1851843b3ad39b01351f415 100644
--- a/NPSimulation/Detectors/SSSD/CMakeLists.txt
+++ b/NPSimulation/Detectors/SSSD/CMakeLists.txt
@@ -1,2 +1,2 @@
 add_library(NPSSSSD SHARED  SSSD.cc)
-target_link_libraries(NPSSSSD NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} ${NPLib_LIBRARIES} -lNPSSSD)
+target_link_libraries(NPSSSSD NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} NPSSSD)
diff --git a/NPSimulation/Detectors/Sharc/CMakeLists.txt b/NPSimulation/Detectors/Sharc/CMakeLists.txt
index eb358ec9b4fbf130cdae80109056581165bd133d..9d0bdc5fc9d075233dd9df5f07561151d2e4a84e 100644
--- a/NPSimulation/Detectors/Sharc/CMakeLists.txt
+++ b/NPSimulation/Detectors/Sharc/CMakeLists.txt
@@ -1,2 +1,2 @@
 add_library(NPSSharc SHARED  Sharc.cc)
-target_link_libraries(NPSSharc NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} ${NPLib_LIBRARIES} -lNPSharc)
+target_link_libraries(NPSSharc NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} NPSharc)
diff --git a/NPSimulation/Detectors/TRex/CMakeLists.txt b/NPSimulation/Detectors/TRex/CMakeLists.txt
index 400fc9ca5ba7c7d66d243d3d077099116869ab62..4bd7a204cc078f96b4608b054fdb1116b5eb70c6 100644
--- a/NPSimulation/Detectors/TRex/CMakeLists.txt
+++ b/NPSimulation/Detectors/TRex/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Check for gdml support
 if(Geant4_gdml_FOUND)  
 add_library(NPSTRex SHARED  TRex.cc)
-target_link_libraries(NPSTRex NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} ${NPLib_LIBRARIES} -lNPTRex)
+target_link_libraries(NPSTRex NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} NPTRex)
 endif()
diff --git a/NPSimulation/Detectors/Tiara/CMakeLists.txt b/NPSimulation/Detectors/Tiara/CMakeLists.txt
index aa2f6600fef9b85de711db7260a234b725f6715a..02661ba8c20f8c6d751545c1137300d65996709a 100644
--- a/NPSimulation/Detectors/Tiara/CMakeLists.txt
+++ b/NPSimulation/Detectors/Tiara/CMakeLists.txt
@@ -1,2 +1,2 @@
 add_library(NPSTiara SHARED  Tiara.cc)
-target_link_libraries(NPSTiara NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} ${NPLib_LIBRARIES} -lNPTiara)
+target_link_libraries(NPSTiara NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} NPTiara)
diff --git a/NPSimulation/Detectors/Tigress/CMakeLists.txt b/NPSimulation/Detectors/Tigress/CMakeLists.txt
index c93d4e4c1fd9c440c11c5305a7f2044ec9983647..5a8080b9e1dfaa8bf60b27f5c686ecfa3b5e6421 100644
--- a/NPSimulation/Detectors/Tigress/CMakeLists.txt
+++ b/NPSimulation/Detectors/Tigress/CMakeLists.txt
@@ -1,2 +1,2 @@
 add_library(NPSTigress SHARED  Tigress.cc)
-target_link_libraries(NPSTigress NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} ${NPLib_LIBRARIES} -lNPTigress)
+target_link_libraries(NPSTigress NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} NPTigress)
diff --git a/NPSimulation/Detectors/W1/CMakeLists.txt b/NPSimulation/Detectors/W1/CMakeLists.txt
index 409e428296577f12a03369e83c5463055578edf4..7bb530317d92216eb8e0c348a3737a692f887b49 100644
--- a/NPSimulation/Detectors/W1/CMakeLists.txt
+++ b/NPSimulation/Detectors/W1/CMakeLists.txt
@@ -1,2 +1,2 @@
 add_library(NPSW1 SHARED  W1.cc W1Scorers.cc)
-target_link_libraries(NPSW1 NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} ${NPLib_LIBRARIES} -lNPW1)
+target_link_libraries(NPSW1 NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} NPW1)
diff --git a/Projects/S1554/macro/MgCSLab.cxx b/Projects/S1554/macro/MgCSLab.cxx
index dad050953bcd028e3ce7138b7221b6e3873c4062..d089f10f322c8a6764ed172f8809df414d887768 100644
--- a/Projects/S1554/macro/MgCSLab.cxx
+++ b/Projects/S1554/macro/MgCSLab.cxx
@@ -14,10 +14,10 @@ void MgCSLab(){
   TH2* Eff = (TH2*) file->FindObjectAny("SolidAngleLab_2D");
 
   Goodfile = new TFile("GoodExThetaLab.root");
-  TH2D* goodEx = (TH2D*) Goodfile->FindObjectAny("hexcmG");
+  TH2D* goodEx = (TH2D*) Goodfile->FindObjectAny("hEL");
 
   Badfile = new TFile("BadExThetaLab.root");
-  TH2D* badEx = (TH2D*) Badfile->FindObjectAny("hexcmB");
+  TH2D* badEx = (TH2D*) Badfile->FindObjectAny("hbEL");
 
   TH2D* h = goodEx;
   badEx->Scale(7./(145-1+300-160));
@@ -37,12 +37,14 @@ void MgCSLab(){
   // Full Ex
   p =  h->ProjectionY(Form("p%i",nn++),h->GetXaxis()->FindBin(0.),h->GetXaxis()->FindBin(50.));
   p->Draw();
-  
+ cout << 5 << endl;
+ 
   new TCanvas();
   h->Draw("colz");
   // CS
   TCanvas* c = new TCanvas("CS","CS",1000,1000);
   c->Divide(2,2);
+cout << 6 << endl;
 
   // Region 
   current = Region(-0.1,0.4,h,c,nn++,Eff);