diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8bacb40d..a4739546 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,6 +16,20 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 include(SetDefaultBuildRelWithDebInfo)
 include(AlwaysColourCompilation)
 
+if(NOT DEFINED ENV{BUILD_CUDA})
+    include(CheckLanguage)
+    check_language(CUDA)
+    if(CMAKE_CUDA_COMPILER)
+        message("CUDA compiler available.")
+        set(BUILD_CUDA ON)
+    else()
+        message("CUDA compiler unavailable.")
+        set(BUILD_CUDA OFF)
+    endif()
+else()
+    set(BUILD_CUDA $ENV{BUILD_CUDA})
+endif()
+
 include_directories(include)
 
 # Dependency fetching
@@ -70,4 +84,8 @@ enable_testing()
 
 add_subdirectory(h5read)
 add_subdirectory(baseline)
-add_subdirectory(spotfinder)
+
+if(BUILD_CUDA)
+    message("Building with CUDA enabled.")
+    add_subdirectory(spotfinder)
+endif()
diff --git a/bitshuffle b/bitshuffle
new file mode 160000
index 00000000..526440a1
--- /dev/null
+++ b/bitshuffle
@@ -0,0 +1 @@
+Subproject commit 526440a16baff44bd405e0741ebd285858a5408d
diff --git a/dx2 b/dx2
index 556051d4..ff503db2 160000
--- a/dx2
+++ b/dx2
@@ -1 +1 @@
-Subproject commit 556051d4d4e6d51c40c600fc350c07f9b299a435
+Subproject commit ff503db22b7a2f866d46ebf56afcd799d39c1c86
diff --git a/pyproject.toml b/pyproject.toml
index 252128d7..83efeb9b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -10,6 +10,7 @@ readme = "README.md"
 authors = [
     { name = "Nicholas Devenish", email = "ndevenish@gmail.com" },
     { name = "Dimitri Vlachos", email = "dimitrios.vlachos@diamond.ac.uk" },
+    { name = "Yash Karan", email = "yash.karan@diamond.ac.uk" },
 ]
 
 requires-python = ">=3.12"