diff --git a/main.cpp b/main.cpp
index 48daaa88de1ac427ef13b0bfa4366a894c4eb185..d0b53ac5792a280bd6adda6fc04cea992f795781 100644
--- a/main.cpp
+++ b/main.cpp
@@ -462,6 +462,7 @@ int main() {
     scenario_1(array, nblocks, nlev, nproma, false);
 
     scenario_1(array, nblocks, nlev, nproma);
+    
     #if defined(gpu)
     #pragma acc enter data copyin(array[0:nblocks*nlev*nproma]) 
     {
@@ -471,11 +472,12 @@ int main() {
       }
     }
     #pragma acc exit data copyout(array[0:nblocks*nlev*nproma])
-    validate(array, nblocks, nlev, nproma);
     #else
       scenario_1b(array, nblocks, nlev, nproma);
     #endif
-   /*
+    validate(array, nblocks, nlev, nproma);
+   
+/*
     scenario_2(array, nblocks, nlev, nproma);
     scenario_2b(array, nblocks, nlev, nproma);
     scenario_3(array, nblocks, nlev, nproma);
@@ -485,6 +487,7 @@ int main() {
     scenario_6(array, nblocks, nlev, nproma);
     scenario_7(array, nblocks, nlev, nproma);
 */
+
     #if defined(gpu)
     #pragma acc enter data copyin(array[0:nblocks*nlev*nproma]) 
     {
@@ -494,11 +497,12 @@ int main() {
       }
     }
     #pragma acc exit data copyout(array[0:nblocks*nlev*nproma])
-    validate(array, nblocks, nlev, nproma);
     #else
       scenario_7b(array, nblocks, nlev, nproma);
     #endif
-      #if defined(gpu)
+    validate(array, nblocks, nlev, nproma);
+
+    #if defined(gpu)
     #pragma acc enter data copyin(array[0:nblocks*nlev*nproma]) 
     {
       #pragma acc host_data use_device(array) 
@@ -507,10 +511,10 @@ int main() {
       }
     }
     #pragma acc exit data copyout(array[0:nblocks*nlev*nproma])
-    validate(array, nblocks, nlev, nproma);
     #else
       scenario_8(array, nblocks, nlev, nproma);
     #endif
+    validate(array, nblocks, nlev, nproma);
 
   }
   Kokkos::finalize();