 #include "../fc2d_cudaclaw.h"
 #include "cudaclaw_allocate.h"
+#include "cudaclaw_update_q.h"
+#include "cudaclaw_flux2.h"
+
+#include <fc2d_cudaclaw_options.h>
 
 #include <fclaw2d_patch.h>
 #include <fclaw2d_global.h>
 #include <fclaw2d_clawpatch.h>
-
-#include "../fc2d_cudaclaw_options.h"
-#include "src/patches/clawpatch/fclaw2d_clawpatch_options.h"
-#include <fclaw2d_global.h>
-
-#include "cudaclaw_update_q.h"
-#include "cudaclaw_flux2.h"
+#include <fclaw2d_clawpatch_options.h>
 
 #include "../fc2d_cudaclaw_check.cu"  /* CHECK defined here */
+
 #include <cublas_v2.h>
+
     
 double cudaclaw_step2_batch(fclaw2d_global_t *glob,
         cudaclaw_fluxes_t* array_fluxes_struct, 

    int maux = clawpatch_opt->maux;
    int meqn = clawpatch_opt->meqn;

//     cudaclaw_fluxes_t* array_fluxes_struct = (cudaclaw_fluxes_t*)
//         malloc(batch_size*sizeof(cudaclaw_fluxes_t));
    cudaclaw_fluxes_t* array_fluxes_struct_dev = NULL;
    cudaMalloc(&array_fluxes_struct_dev, batch_size*sizeof(cudaclaw_fluxes_t));
// 
//     for (int i = 0; i < batch_size; ++i)
//     {
//         array_fluxes_struct[i] = *(array_ptr_fluxes[i]);
//     }
    CHECK(cudaMemcpy(array_fluxes_struct_dev, array_fluxes_struct, batch_size*sizeof(cudaclaw_fluxes_t), cudaMemcpyHostToDevice));

    dim3 block(128,1,1);

    cudaDeviceSynchronize();
    CHECK(cudaPeekAtLastError());

    /* -------------------------------- Compute CFL ------------------------------------*/ 
    int n = 2*mwaves*(2*mbc+mx)*(2*mbc+my);
    int maxidx;

