diff --git a/catkin_ws/src/arena_camera/cmake/Findarena_sdk.cmake b/catkin_ws/src/arena_camera/cmake/Findarena_sdk.cmake
index 5f76e3db..f194dcc1 100755
--- a/catkin_ws/src/arena_camera/cmake/Findarena_sdk.cmake
+++ b/catkin_ws/src/arena_camera/cmake/Findarena_sdk.cmake
@@ -5,6 +5,7 @@ set(_LOG_LVL_FRMT "-- [ ${_LOG_LVL} ] ")
 # the installation script place
 set(_arena_sdk_conf "/etc/ld.so.conf.d/Arena_SDK.conf")
 
+
 if(EXISTS ${_arena_sdk_conf})
 
 	###### --------------------------------------------------------------------
@@ -37,20 +38,35 @@ if(EXISTS ${_arena_sdk_conf})
 	###### --------------------------------------------------------------------
 	# LIBS
 	######
-
-	set(arena_sdk_LIBS
+	
+	if(EXISTS ${arena_sdk_installation_root}/GenICam/library/lib/Linux64_x64/libGCBase_gcc421_v3_0.so)
+		set(ArenaSDK_Build "Linux64_x64_pre_54")
+	elseif(EXISTS ${arena_sdk_installation_root}/GenICam/library/lib/Linux64_x64/libGCBase_gcc54_v3_3_LUCID.so)
+		set(ArenaSDK_Build "Linux64_x64_54")
+	elseif(EXISTS ${arena_sdk_installation_root}/GenICam/library/lib/Linux64_ARM/libGCBase_gcc54_v3_3_LUCID.so)
+		set(ArenaSDK_Build "Linux64_ARM")
+		
+	else()
+		message( FATAL_ERROR "LUCID GenICam not found. Please reisntall ArenaSDK "
+					 "If having issues, contact: "
+					 "LUCID support team (support@thinklucid.com). ")
+	endif()
+	
+	if("${ArenaSDK_Build}" STREQUAL "Linux64_x64_pre_54")
+		set(arena_sdk_LIBS
 
 		## ArenaSDK
-		#${arena_sdk_installation_root}/lib64/libsave.so
-		#${arena_sdk_installation_root}/lib64/libsaved.so
-		
+
+		## release
 		${arena_sdk_installation_root}/lib64/libarena.so
-		#${arena_sdk_installation_root}/lib64/libarenad.so
-		
+		${arena_sdk_installation_root}/lib64/libsave.so
 		${arena_sdk_installation_root}/lib64/libgentl.so
-		#${arena_sdk_installation_root}/lib64/libgentld.so
-		
 		#${arena_sdk_installation_root}/lib64/liblucidlog.so
+
+		## debug
+		#${arena_sdk_installation_root}/lib64/libarenad.so
+		#${arena_sdk_installation_root}/lib64/libsaved.so
+		#${arena_sdk_installation_root}/lib64/libgentld.so
 		#${arena_sdk_installation_root}/lib64/liblucidlogd.so
 
 		## GenICam
@@ -67,6 +83,71 @@ if(EXISTS ${_arena_sdk_conf})
 		#${arena_sdk_installation_root}/ffmpeg/libavutil.so
 		#${arena_sdk_installation_root}/ffmpeg/libswresample.so
 		)
+	elseif("${ArenaSDK_Build}" STREQUAL "Linux64_x64_54")
+		set(arena_sdk_LIBS
+
+		## ArenaSDK
+
+		## release
+		${arena_sdk_installation_root}/lib64/libarena.so
+		${arena_sdk_installation_root}/lib64/libsave.so
+		${arena_sdk_installation_root}/lib64/libgentl.so
+		#${arena_sdk_installation_root}/lib64/liblucidlog.so
+
+		## debug
+		#${arena_sdk_installation_root}/lib64/libarenad.so
+		#${arena_sdk_installation_root}/lib64/libsaved.so
+		#${arena_sdk_installation_root}/lib64/libgentld.so
+		#${arena_sdk_installation_root}/lib64/liblucidlogd.so
+
+		## GenICam
+		${arena_sdk_installation_root}/GenICam/library/lib/Linux64_x64/libGCBase_gcc54_v3_3_LUCID.so
+		${arena_sdk_installation_root}/GenICam/library/lib/Linux64_x64/libGenApi_gcc54_v3_3_LUCID.so
+		#${arena_sdk_installation_root}/GenICam/library/lib/Linux64_x64/liblog4cpp_gcc54_v3_3_LUCID.so
+		#${arena_sdk_installation_root}/GenICam/library/lib/Linux64_x64/libLog_gcc54_v3_3_LUCID.so
+		#${arena_sdk_installation_root}/GenICam/library/lib/Linux64_x64/libMathParser_gcc54_v3_3_LUCID.so
+		#${arena_sdk_installation_root}/GenICam/library/lib/Linux64_x64/libNodeMapData_gcc54_v3_3_LUCID.so
+		#${arena_sdk_installation_root}/GenICam/library/lib/Linux64_x64/libXmlParser_gcc54_v3_3_LUCID.so
+		
+		## fmpeg
+		#${arena_sdk_installation_root}/ffmpeg/libavcodec.so
+		#${arena_sdk_installation_root}/ffmpeg/libavformat.so
+		#${arena_sdk_installation_root}/ffmpeg/libavutil.so
+		#${arena_sdk_installation_root}/ffmpeg/libswresample.so
+		)
+	elseif("${ArenaSDK_Build}" STREQUAL "Linux64_ARM")
+		set(arena_sdk_LIBS
+
+		## ArenaSDK
+
+		## release
+		${arena_sdk_installation_root}/lib/libarena.so
+		${arena_sdk_installation_root}/lib/libsave.so
+		${arena_sdk_installation_root}/lib/libgentl.so
+		#${arena_sdk_installation_root}/lib/liblucidlog.so
+
+		## debug
+		#${arena_sdk_installation_root}/lib/libarenad.so
+		#${arena_sdk_installation_root}/lib/libsaved.so
+		#${arena_sdk_installation_root}/lib/libgentld.so
+		#${arena_sdk_installation_root}/lib/liblucidlogd.so
+
+		## GenICam
+		${arena_sdk_installation_root}/GenICam/library/lib/Linux64_ARM/libGCBase_gcc54_v3_3_LUCID.so
+		${arena_sdk_installation_root}/GenICam/library/lib/Linux64_ARM/libGenApi_gcc54_v3_3_LUCID.so
+		#${arena_sdk_installation_root}/GenICam/library/lib/Linux64_ARM/liblog4cpp_gcc54_v3_3_LUCID.so
+		#${arena_sdk_installation_root}/GenICam/library/lib/Linux64_ARM/libLog_gcc54_v3_3_LUCID.so
+		#${arena_sdk_installation_root}/GenICam/library/lib/Linux64_ARM/libMathParser_gcc54_v3_3_LUCID.so
+		#${arena_sdk_installation_root}/GenICam/library/lib/Linux64_ARM/libNodeMapData_gcc54_v3_3_LUCID.so
+		#${arena_sdk_installation_root}/GenICam/library/lib/Linux64_ARM/libXmlParser_gcc54_v3_3_LUCID.so
+		
+		## fmpeg
+		#${arena_sdk_installation_root}/ffmpeg/libavcodec.so
+		#${arena_sdk_installation_root}/ffmpeg/libavformat.so
+		#${arena_sdk_installation_root}/ffmpeg/libavutil.so
+		#${arena_sdk_installation_root}/ffmpeg/libswresample.so
+		)
+	endif()
 
 	set(arena_sdk_LIBRARIES ${arena_sdk_LIBS})
 	#set(arena_sdk_DEFINITIONS GENICAM_USER_ACCEPTS_ANY_COMPILER)
@@ -98,4 +179,4 @@ else()
 	message( FATAL_ERROR "ArenaSDK is not installed. Please isntall ArenaSDK "
 						 "using the script provided by LUCID support "
 						 "team (support@thinklucid.com). ")
-endif()
\ No newline at end of file
+endif()