diff --git a/netbeans_run_debug_satanexperimental.sh b/netbeans_run_debug_satanexperimental.sh
index 3c5339bf1cd41728ab439f68c44a018288e5d39b..59ce5f99c159f6f58004d487fcc47a6ee55e91f6 100755
--- a/netbeans_run_debug_satanexperimental.sh
+++ b/netbeans_run_debug_satanexperimental.sh
@@ -66,7 +66,7 @@ mv ./initial.tnl init.tnl
                   --discrete-solver euler \
                   --snapshot-period 0.0005 \
                   --final-time 0.1 \
-                  --time-step 0.000001
+                  --time-step 0.00005
 
  ./tnl-view-dbg --mesh mesh.tnl \
           --input-files *.tnl \ 
diff --git a/src/core/arrays/tnlStaticArray.h b/src/core/arrays/tnlStaticArray.h
index cb6d83e24f1cf8ede209196feaab2426da998ce8..92d1429db5ff8063947344a79478d067ddc8d168 100644
--- a/src/core/arrays/tnlStaticArray.h
+++ b/src/core/arrays/tnlStaticArray.h
@@ -374,9 +374,9 @@ class tnlStaticArray< 3, Element >
 
 };
 
-template< int Size, typename Element >
+/*template< int Size, typename Element >
 ostream& operator << ( ostream& str, const tnlStaticArray< Size, Element >& a );
-
+*/
 #include <core/arrays/tnlStaticArray_impl.h>
 #include <core/arrays/tnlStaticArray1D_impl.h>
 #include <core/arrays/tnlStaticArray2D_impl.h>
diff --git a/src/core/arrays/tnlStaticArray1D_impl.h b/src/core/arrays/tnlStaticArray1D_impl.h
index fc6c17b8e26f4dbdb41d6ea5c5ab87afda6396df..2be7721fb61c55b5603484cb18c6593f44f1eb31 100644
--- a/src/core/arrays/tnlStaticArray1D_impl.h
+++ b/src/core/arrays/tnlStaticArray1D_impl.h
@@ -194,6 +194,7 @@ void tnlStaticArray< 1, Element >::sort()
 }
 
 template< typename Element >
+__device_callable__
 ostream& tnlStaticArray< 1, Element >::write( ostream& str, const char* separator ) const
 {
    str << data[ 0 ];
diff --git a/src/core/arrays/tnlStaticArray2D_impl.h b/src/core/arrays/tnlStaticArray2D_impl.h
index f7194dd8a3fdabdfd32b009ca25e563f181c1171..0529026bf0be1ca3f0c8fbdaf4fce697842c80a1 100644
--- a/src/core/arrays/tnlStaticArray2D_impl.h
+++ b/src/core/arrays/tnlStaticArray2D_impl.h
@@ -221,6 +221,7 @@ void tnlStaticArray< 2, Element >::sort()
 }
 
 template< typename Element >
+__device_callable__
 ostream& tnlStaticArray< 2, Element >::write( ostream& str, const char* separator ) const
 {
    str << data[ 0 ] << separator << data[ 1 ];
diff --git a/src/core/arrays/tnlStaticArray3D_impl.h b/src/core/arrays/tnlStaticArray3D_impl.h
index b663fd24e278e00fca902e0d4e6deade6ac953a9..013fd1b2c2c02e2f224f17d53d988efc18830cb4 100644
--- a/src/core/arrays/tnlStaticArray3D_impl.h
+++ b/src/core/arrays/tnlStaticArray3D_impl.h
@@ -248,6 +248,7 @@ void tnlStaticArray< 3, Element >::sort()
 }
 
 template< typename Element >
+__device_callable__
 ostream& tnlStaticArray< 3, Element >::write( ostream& str, const char* separator ) const
 {
    str << data[ 0 ] << separator << data[ 1 ] << separator << data[ 2 ];
diff --git a/src/core/arrays/tnlStaticArray_impl.h b/src/core/arrays/tnlStaticArray_impl.h
index fd613042e685c94819f2d1579e857a67d0ab31dd..1714b3a83a69f5a428ef9f02a6ba21317edd9510 100644
--- a/src/core/arrays/tnlStaticArray_impl.h
+++ b/src/core/arrays/tnlStaticArray_impl.h
@@ -195,6 +195,7 @@ void tnlStaticArray< Size, Element >::sort()
 }
 
 template< int Size, typename Element >
+__device_callable__
 ostream& tnlStaticArray< Size, Element >::write( ostream& str, const char* separator ) const
 {
    for( int i = 0; i < Size - 1; i++ )
@@ -205,6 +206,7 @@ ostream& tnlStaticArray< Size, Element >::write( ostream& str, const char* separ
 
 
 template< int Size, typename Element >
+__device_callable__
 ostream& operator << ( ostream& str, const tnlStaticArray< Size, Element >& a )
 {
    a.write( str, "," );
diff --git a/src/core/tnlAssert.h b/src/core/tnlAssert.h
index 64c79512a5db8deeb844870cb46faba4d7c6e398..78b3dd25097edbd30e6e58b6774d0963c04fd9eb 100644
--- a/src/core/tnlAssert.h
+++ b/src/core/tnlAssert.h
@@ -22,8 +22,6 @@
  * Debugging assert
  */
 
-#define NDEBUG
-
 #ifndef NDEBUG
 
 
@@ -65,6 +63,7 @@
         ___tnl__assert_command;                                                              \
         throw EXIT_FAILURE;                                                                 \
 	}
+
 #endif /* HAVE_CUDA */
 #else /* #ifndef NDEBUG */
 #define tnlAssert( ___tnl__assert_condition, ___tnl__assert_command )
diff --git a/src/core/tnlDevice_Callable.h b/src/core/tnlDevice_Callable.h
index e8fee71d8ef776ed88425b81e3fc9e7c138bc1d5..c2db6dd56e7923abaa118748c3de1dfee073cb9c 100644
--- a/src/core/tnlDevice_Callable.h
+++ b/src/core/tnlDevice_Callable.h
@@ -20,18 +20,22 @@
 #else
     #define __cuda_callable__ 
 #endif
+*/
 
-//NEW, better  __device_callable__ --used only with MIC touch code
+//NEW, not implemented yet 
 #ifdef HAVE_MIC 
     #define __device_callable__ __attribute__((target(mic)))
+    #define __cuda_callable__ __attribute__((target(mic)))
 #elif HAVE_CUDA
     #define __device_callable__ __device__ __host__
+    #define __cuda_callable__ __device__ __host__
 #else
     #define __device_callable__ 
+    #define __cuda_callable__
 #endif
-*/
 
-#define __cuda_callable__ __attribute__((target(mic)))
-#define __device_callable__ __attribute__((target(mic)))
+
+//#define __cuda_callable__ __attribute__((target(mic)))
+//#define __device_callable__ __attribute__((target(mic)))
 #endif /* TNLDEVICE_CALLABLE_H */