diff --git a/example/time-paradigm.f90 b/example/time-paradigm.f90
index 3521b16..1f34b8f 100644
--- a/example/time-paradigm.f90
+++ b/example/time-paradigm.f90
@@ -4,13 +4,36 @@ program time_paradigm_m
   !! Time various alternative programming paradigms
   use subdomain_m, only : subdomain_t
   use assert_m, only : assert
+  use sourcery_m, only : string_t, file_t, command_line_t, bin_t, csv 
   use iso_fortran_env, only : int64
   implicit none
-  integer, parameter :: steps = 1000, resolution=256
+
   real, parameter :: alpha=1., T_internal_initial=1., T_boundary=0., T_steady=T_boundary, tolerance = 1.E-03
+  character(len=:), allocatable :: steps_string, resolution_string
+  type(command_line_t) command_line
+  integer(int64) counter_start, counter_end, clock_rate
+  integer :: steps=200, resolution=64
 
   associate(me => this_image())
-    if (me==1) print *,"Starting functional solver."
+    if (command_line%argument_present(["--help"])) then
+      print *, &
+        new_line('a') // new_line('a') // &
+        'Usage: fpm run --example time-paradigm -- [--steps <integer>] [--resolution <integer>]' // &
+        new_line('a') // new_line('a') // &
+        'where square brackets indicate optional arguments'
+      stop
+    end if
+
+    steps_string = string_t(command_line%flag_value("--steps"))
+    resolution_string = string_t(command_line%flag_value("--resolution"))
+    if (len(steps_string)/=0) read(steps_string,*) steps
+    if (len(resolution_string)/=0) read(resolution_string,*) resolution
+
+    if (me==1) then 
+      print *,"Number of steps to execute: ",steps
+      print *,"Number of grid points in each coordinate direction: ",resolution
+      print *,"Starting functional solver."
+    end if
     associate(t_functional => functional_programming_time())
       if (me==1) print *,"Starting procedural solver."
       associate(t_procedural => functional_programming_time())
diff --git a/fpm.toml b/fpm.toml
index 40278e8..e9a5070 100644
--- a/fpm.toml
+++ b/fpm.toml
@@ -10,5 +10,5 @@ source-dir="app"
 main = "main.F90"
 
 [dependencies]
-assert = {git = "https://github.com/sourceryinstitute/assert", tag = "1.4.0"}
-sourcery = {git = "https://github.com/sourceryinstitute/sourcery", tag = "3.8.0"}
+assert = {git = "https://github.com/sourceryinstitute/assert", tag = "1.5.0"}
+sourcery = {git = "https://github.com/sourceryinstitute/sourcery", tag = "4.5.0"}
diff --git a/src/matcha/subdomain_s.f90 b/src/matcha/subdomain_s.f90
index 2805786..2ca5eb9 100644
--- a/src/matcha/subdomain_s.f90
+++ b/src/matcha/subdomain_s.f90
@@ -1,5 +1,5 @@
 submodule(subdomain_m) subdomain_s
-  use data_partition_m, only : data_partition_t
+  use sourcery_m, only : data_partition_t
   use assert_m, only : assert
   use intrinsic_array_m, only : intrinsic_array_t
   implicit none
@@ -11,6 +11,7 @@
 
   real dx_, dy_, dz_
   integer my_nx, nx, ny, nz, me, num_subdomains, my_internal_west, my_internal_east
+  real, allocatable :: increment(:,:,:)
 
 contains
 
@@ -138,14 +139,12 @@
 
   module procedure step
 
-    real, allocatable :: increment(:,:,:)
-
     call assert(allocated(self%s_), "subdomain_t%laplacian: allocated(rhs%s_)")
     call assert(allocated(halo_x), "subdomain_t%laplacian: allocated(halo_x)")
     call assert(my_internal_west+1<=my_nx,"laplacian: westernmost subdomain too small")
     call assert(my_internal_east-1>0,"laplacian: easternmost subdomain too small")
 
-    allocate(increment(my_nx,ny,nz))
+    if (.not. allocated(increment)) allocate(increment(my_nx,ny,nz))
  
     call internal_points(increment)
     call edge_points(increment)
@@ -164,9 +163,9 @@ subroutine internal_points(ds)
 
       do concurrent(i=my_internal_west+1:my_internal_east-1, j=2:ny-1, k=2:nz-1)
         ds(i,j,k) = alpha_dt*( &
-          (self%s_(i-1,j  ,k  ) - 2*self%s_(i,j,k) + self%s_(i+1,j,k  ))/dx_**2 + &
-          (self%s_(i  ,j-1,k  ) - 2*self%s_(i,j,k) + self%s_(i,j+1,k  ))/dy_**2 + &
-          (self%s_(i  ,j  ,k-1) - 2*self%s_(i,j,k) + self%s_(i,j  ,k+1))/dz_**2 &
+          (self%s_(i-1,j  ,k  ) - 2*self%s_(i,j,k) + self%s_(i+1,j  ,k  ))/dx_**2 + &
+          (self%s_(i  ,j-1,k  ) - 2*self%s_(i,j,k) + self%s_(i  ,j+1,k  ))/dy_**2 + &
+          (self%s_(i  ,j  ,k-1) - 2*self%s_(i,j,k) + self%s_(i  ,j  ,k+1))/dz_**2 &
         )
       end do
     end subroutine
@@ -202,7 +201,7 @@ subroutine apply_boundary_condition(ds)
       real, intent(inout) :: ds(:,:,:)
       integer i, j
 
-      ds(:,1:ny:ny-1,:        ) = 0.
+      ds(:,1:ny:ny-1, :       ) = 0.
       ds(:, :       ,1:nz:nz-1) = 0.
       if (me==1) ds(1,:,:) = 0.
       if (me==num_subdomains) ds(my_nx,:,:) = 0.
diff --git a/src/matcha_m.f90 b/src/matcha_m.f90
index 1cbd6b9..07118a6 100644
--- a/src/matcha_m.f90
+++ b/src/matcha_m.f90
@@ -5,7 +5,6 @@ module matcha_m
   use distribution_m, only : distribution_t
   use input_m, only : input_t
   use output_m, only : output_t
-  use data_partition_m, only : data_partition_t
   use subdomain_m, only : subdomain_t
   
   implicit none
diff --git a/src/matcha_s.F90 b/src/matcha_s.F90
index 3c3e087..4735efc 100644
--- a/src/matcha_s.F90
+++ b/src/matcha_s.F90
@@ -3,7 +3,7 @@
 submodule(matcha_m) matcha_s
   use t_cell_collection_m, only : t_cell_collection_t
   use distribution_m, only : distribution_t
-  use data_partition_m, only : data_partition_t
+  use sourcery_m, only : data_partition_t
   implicit none
   
 contains
diff --git a/test/matcha_test_m.f90 b/test/matcha_test_m.f90
index ae10108..f75e164 100644
--- a/test/matcha_test_m.f90
+++ b/test/matcha_test_m.f90
@@ -1,8 +1,7 @@
 ! Copyright (c), The Regents of the University of California
 ! Terms of use are as specified in LICENSE.txt
 module matcha_test_m
-  use test_m, only : test_t
-  use test_result_m, only : test_result_t
+  use sourcery_m, only : test_t, test_result_t
   use input_m, only : input_t
   use output_m, only : output_t
   use matcha_m, only : matcha
diff --git a/test/subdomain_test_m.f90 b/test/subdomain_test_m.f90
index 8686da8..144ab6e 100644
--- a/test/subdomain_test_m.f90
+++ b/test/subdomain_test_m.f90
@@ -2,8 +2,7 @@
 ! Terms of use are as specified in LICENSE.txt
 module subdomain_test_m
   !! Define subdomain tests and procedures required for reporting results
-  use test_m, only : test_t
-  use test_result_m, only : test_result_t
+  use sourcery_m, only : test_t, test_result_t
   use subdomain_m, only : subdomain_t
   use assert_m, only : assert
   implicit none
diff --git a/test/t_cell_collection_test_m.f90 b/test/t_cell_collection_test_m.f90
index 11ee6e8..a9ac2f7 100644
--- a/test/t_cell_collection_test_m.f90
+++ b/test/t_cell_collection_test_m.f90
@@ -2,8 +2,7 @@
 ! Terms of use are as specified in LICENSE.txt
 module t_cell_collection_test_m
   !! Define t_cell_collection tests and procedures required for reporting results
-  use test_m, only : test_t
-  use test_result_m, only : test_result_t
+  use sourcery_m, only : test_t, test_result_t
   use t_cell_collection_m, only : t_cell_collection_t
   use iso_fortran_env, only : output_unit
   use input_m, only : input_t