diff --git a/matlab/compute/compute_fa_2D.m b/matlab/compute/compute_fa_2D.m
index 50b3593fa32ac761714a468f94a09c04722ab527..c66ebba52a905af9f9c3760b2081cd6d91b7abad 100644
--- a/matlab/compute/compute_fa_2D.m
+++ b/matlab/compute/compute_fa_2D.m
@@ -55,14 +55,14 @@ if options.non_adiab
         for ikx = 1:data.Nkx
             for iky = 1:data.Nky    
                 kp_ = sqrt(kx_(ikx)^2 + ky_(iky)^2);
-                Napj_(1,ij_,ikx,iky) = Napj_(1,ij_,ikx,iky) + kernel(ij_,kp_)*phi_(ikx,iky);
+                Napj_(1,ij_,iky,ikx) = Napj_(1,ij_,iky,ikx) + kernel(ij_,kp_)*phi_(iky,ikx);
             end
         end
     end
 end
 
 if options.RMS
-    FF = zeros(data.Nkx,data.Nky,numel(options.XPERP),numel(options.SPAR));
+    FF = zeros(data.Nky,data.Nkx,numel(options.XPERP),numel(options.SPAR));
     FAM = FaM(SS,XX);
     for ip_ = 1:Np
         p_ = parray(ip_);
@@ -73,7 +73,7 @@ if options.RMS
             HLF = HH.*LL.*FAM;
             for ikx = 1:data.Nkx
                 for iky = 1:data.Nky
-                    FF(ikx,iky,:,:) = squeeze(FF(ikx,iky,:,:)) + Napj_(ip_,ij_,ikx,iky)*HLF;
+                    FF(iky,ikx,:,:) = squeeze(FF(iky,ikx,:,:)) + Napj_(ip_,ij_,iky,ikx)*HLF;
                 end
             end
        end
diff --git a/wk/analysis_3D.m b/wk/analysis_3D.m
index 0f2cdef4992547526109342c2f5ab888162bf3d6..34dbcadc3d0992c4011f8f35ee316c932b2502ba 100644
--- a/wk/analysis_3D.m
+++ b/wk/analysis_3D.m
@@ -95,14 +95,17 @@ end
 
 if 0
 %% Kinetic distribution function sqrt(<f_a^2>xy) (GENE vsp)
-options.SPAR      = linspace(-3,3,64)+(6/127/2);
-options.XPERP     = linspace( 0,6,64);
-% options.SPAR      = vp';
-% options.XPERP     = mu';
-options.Z         = 1;
+% options.SPAR      = linspace(-3,3,64)+(6/127/2);
+% options.XPERP     = linspace( 0,6,64);
+options.SPAR      = gene_data.vp';
+options.XPERP     = gene_data.mu';
+options.Z         = 'avg';
 options.T         = 200;
-options.CTR       = 1;
+options.PLT_FCT   = 'pcolor';
 options.ONED      = 0;
+options.non_adiab = 1;
+options.SPECIE    = 'i';
+options.RMS       = 1; % Root mean square i.e. sqrt(sum_k|f_k|^2) as in Gene
 fig = plot_fa(data,options);
 save_figure(data,fig)
 end
diff --git a/wk/gene_analysis_3D.m b/wk/gene_analysis_3D.m
index ed4d356579cfc22098722e57c9d79c22ef3ec25c..7479f55e01cc499700f992c2c07ec6d1505826e6 100644
--- a/wk/gene_analysis_3D.m
+++ b/wk/gene_analysis_3D.m
@@ -1,6 +1,6 @@
 % folder = '/misc/gene_results/shearless_cyclone/miller_output_1.0/';
 % folder = '/misc/gene_results/shearless_cyclone/miller_output_0.8/';
-folder = '/misc/gene_results/shearless_cyclone/s_alpha_output_1.2/';
+folder = '/misc/gene_results/shearless_cyclone/s_alpha_output_1.0/';
 % folder = '/misc/gene_results/shearless_cyclone/s_alpha_output_0.5/';
 % folder = '/misc/gene_results/shearless_cyclone/LD_s_alpha_output_1.0/';
 % folder = '/misc/gene_results/shearless_cyclone/LD_s_alpha_output_0.8/';
@@ -93,11 +93,11 @@ gene_data = rotate_c_plane_nxnky_to_nkxny(gene_data);
 if 1
 %% Space time diagramm (fig 11 Ivanov 2020)
 TAVG_0 = 0.8*gene_data.Ts3D(end); TAVG_1 = gene_data.Ts3D(end); % Averaging times duration
-% chose your field to plot in spacetime diag (uzf,szf,Gx)
-field = 'phi';
-compz = 'avg';
-nmvm  = 1;
-fig = plot_radial_transport_and_spacetime(gene_data,TAVG_0,TAVG_1,field,nmvm,compz);
+options.NMVA     = 1;              % Moving average for time traces
+% options.ST_FIELD = '\Gamma_x';          % chose your field to plot in spacetime diag (e.g \phi,v_x,G_x)
+options.ST_FIELD = '\phi';          % chose your field to plot in spacetime diag (e.g \phi,v_x,G_x)
+options.INTERP   = 1;
+fig = plot_radial_transport_and_spacetime(gene_data,options);
 % save_figure(data,fig)
 end