diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1bd29143..396b7e70 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,10 +32,20 @@ variables:
       LinearElastic               $LinearElastic_Repo                   master
       B4                          $B4_Repo                              master
       VonMises                    $VonMises_Repo                        master
-    
+
+format:
+  stage: test
+  image: condaforge/mambaforge:22.9.0-2
+  needs: []
+  script:
+    - mamba install -c conda-forge clang-format-15
+    - find .  \( -name \*.cpp -o -name \*.h \) -print0 | xargs -0 -n 1 clang-format-15 --Werror -n --verbose
+  only:
+    - merge_requests
+
 build and test:
   stage: build
-  image: condaforge/mambaforge:latest
+  image: condaforge/mambaforge:22.9.0-2
   script:
     
     - function install_marmot_module(){
@@ -109,12 +119,4 @@ build and test:
     - python setup.py build_ext -i
     - python run_tests.py
 
-format:
-  stage: test
-  image: nexus.lumiplan.com:8443/toolchain/clang-format:13
-  needs: []
-  script:
-    - find .  \( -name \*.cpp -o -name \*.h \) -print0 | xargs -0 -n 1 clang-format-13 --Werror -n --verbose
-  only:
-    - merge_requests
 
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 9d9f9da4..beb26fcc 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
 - repo: https://github.com/pre-commit/mirrors-clang-format
-  rev: v14.0.0
+  rev: v15.0.7
   hooks:
   - id: clang-format
     args: ["--dry-run", "--Werror" ]
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5325c71f..60c85feb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -114,6 +114,8 @@ endif()
 
 if(NOT MATERIAL_MODULES OR MATERIAL_MODULES STREQUAL "all")
     set (MATERIAL_MODULES
+        ADLinearElastic
+        ADVonMises
         B4
         Barodesy
         BarodesyGradientVoid
@@ -160,6 +162,8 @@ if(NOT MATERIAL_MODULES OR MATERIAL_MODULES STREQUAL "all")
         ViscoPlasticShotcreteModel
         VonMises
         PorousElastic
+        ADRedWildmoorSandstone
+        NDRedWildmoorSandstone
         RedWildmoorSandstone
         RockDamagePlasticity
         RockDamagePlasticityNonLocal
@@ -186,6 +190,7 @@ if(NOT ELEMENT_MODULES OR ELEMENT_MODULES STREQUAL "all")
     set(ELEMENT_MODULES
         CosseratFiniteElement
         DisplacementFiniteElement
+        ADDisplacementFiniteElement
         DisplacementTLFiniteElement
         DisplacementULFiniteElement
         DisplacementEASFiniteElement
diff --git a/modules/core/MarmotMathCore b/modules/core/MarmotMathCore
index aceb85b1..9810074c 160000
--- a/modules/core/MarmotMathCore
+++ b/modules/core/MarmotMathCore
@@ -1 +1 @@
-Subproject commit aceb85b181bf3f3234ac2ef27f9a01edbbb4eeb5
+Subproject commit 9810074cfc1c86851f00168d019a504901d865d4
diff --git a/modules/core/MarmotMechanicsCore b/modules/core/MarmotMechanicsCore
index aa41dc52..69a5e1a2 160000
--- a/modules/core/MarmotMechanicsCore
+++ b/modules/core/MarmotMechanicsCore
@@ -1 +1 @@
-Subproject commit aa41dc520cb7dfa3b32195802214efc5546a5b1d
+Subproject commit 69a5e1a2cb16c81af0e1848fdd7e947b461e78e9