diff --git a/matlab/setup.m b/matlab/setup.m
index d5c94663890179d23c8bd0e160e8e368ee3a8fcc..d9beeda9592ce88bd3a3483ee7f711e41f593a7c 100644
--- a/matlab/setup.m
+++ b/matlab/setup.m
@@ -13,7 +13,8 @@ GRID.kpar  = KPAR;
 
 % Model parameters
 MODEL.CO      = CO;  % Collision operator (0 : L.Bernstein, -1 : Full Coulomb, -2 : Dougherty)
-MODEL.CLOS   = CLOS;
+MODEL.CLOS    = CLOS;
+MODEL.NL_CLOS = NL_CLOS;
 if NON_LIN; MODEL.NON_LIN = '.true.'; else; MODEL.NON_LIN = '.false.';end;
 MODEL.mu      = MU;
 MODEL.mu_p    = MU_P;
@@ -41,27 +42,74 @@ if INIT_PHI; INITIAL.init_noisy_phi = '.true.'; else; INITIAL.init_noisy_phi = '
 INITIAL.initback_moments  = 0.0e-5;
 INITIAL.initnoise_moments = NOISE0;
 INITIAL.iseed             = 42;
-fcmat_pmaxe = 25;
-fcmat_jmaxe = 18;
-fcmat_pmaxi = 25;
-fcmat_jmaxi = 18;
-INITIAL.selfmat_file = ...
-    ['''../../../iCa/self_Coll_GKE_0_GKI_0_ESELF_1_ISELF_1_Pmaxe_',num2str(fcmat_pmaxe),...
-    '_Jmaxe_',num2str(fcmat_jmaxe),'_Pmaxi_',num2str(fcmat_pmaxi),'_Jmaxi_',...
-    num2str(fcmat_jmaxi),'_pamaxx_10.h5'''];
-INITIAL.eimat_file = ...
-    ['''../../../iCa/ei_Coll_GKE_0_GKI_0_ETEST_1_EBACK_1_Pmaxe_',num2str(fcmat_pmaxe),...
-    '_Jmaxe_',num2str(fcmat_jmaxe),'_Pmaxi_',num2str(fcmat_pmaxi),'_Jmaxi_',...
-    num2str(fcmat_jmaxi),'_pamaxx_10_tau_1.0000_mu_0.0233.h5'''];
-INITIAL.iemat_file = ...
-    ['''../../../iCa/ie_Coll_GKE_0_GKI_0_ITEST_1_IBACK_1_Pmaxe_',num2str(fcmat_pmaxe),...
-    '_Jmaxe_',num2str(fcmat_jmaxe),'_Pmaxi_',num2str(fcmat_pmaxi),'_Jmaxi_',...
-    num2str(fcmat_jmaxi),'_pamaxx_10_tau_1.0000_mu_0.0233.h5'''];
+INITIAL.selfmat_file = '''null''';
+INITIAL.eimat_file = '''null''';
+INITIAL.iemat_file = '''null''';
+if (CO == -3) % Write matrice filename for Full Coulomb DK
+    cmat_pmaxe = 25;
+    cmat_jmaxe = 18;
+    cmat_pmaxi = 25;
+    cmat_jmaxi = 18;
+    INITIAL.selfmat_file = ...
+        ['''../../../iCa/self_Coll_GKE_0_GKI_0_ESELF_1_ISELF_1_Pmaxe_',num2str(cmat_pmaxe),...
+        '_Jmaxe_',num2str(cmat_jmaxe),'_Pmaxi_',num2str(cmat_pmaxi),'_Jmaxi_',...
+        num2str(cmat_jmaxi),'_pamaxx_10.h5'''];
+    INITIAL.eimat_file = ...
+        ['''../../../iCa/ei_Coll_GKE_0_GKI_0_ETEST_1_EBACK_1_Pmaxe_',num2str(cmat_pmaxe),...
+        '_Jmaxe_',num2str(cmat_jmaxe),'_Pmaxi_',num2str(cmat_pmaxi),'_Jmaxi_',...
+        num2str(cmat_jmaxi),'_pamaxx_10_tau_1.0000_mu_0.0233.h5'''];
+    INITIAL.iemat_file = ...
+        ['''../../../iCa/ie_Coll_GKE_0_GKI_0_ITEST_1_IBACK_1_Pmaxe_',num2str(cmat_pmaxe),...
+        '_Jmaxe_',num2str(cmat_jmaxe),'_Pmaxi_',num2str(cmat_pmaxi),'_Jmaxi_',...
+        num2str(cmat_jmaxi),'_pamaxx_10_tau_1.0000_mu_0.0233.h5'''];
+elseif (CO == -2) % Write matrice filename for DK Sugama
+    cmat_pmaxe = 10;
+    cmat_jmaxe = 5;
+    cmat_pmaxi = 10;
+    cmat_jmaxi = 5;
+    INITIAL.selfmat_file = ...
+        ['''../../../iCa/self_Coll_GKE_0_GKI_0_ESELF_3_ISELF_3_Pmaxe_',num2str(cmat_pmaxe),...
+        '_Jmaxe_',num2str(cmat_jmaxe),'_Pmaxi_',num2str(cmat_pmaxi),'_Jmaxi_',...
+        num2str(cmat_jmaxi),'_JE_12.h5'''];
+    INITIAL.eimat_file = ...
+        ['''../../../iCa/ei_Coll_GKE_0_GKI_0_ETEST_3_EBACK_3_Pmaxe_',num2str(cmat_pmaxe),...
+        '_Jmaxe_',num2str(cmat_jmaxe),'_Pmaxi_',num2str(cmat_pmaxi),'_Jmaxi_',...
+        num2str(cmat_jmaxi),'_JE_12_tau_1.0000_mu_0.0233.h5'''];
+    INITIAL.iemat_file = ...
+        ['''../../../iCa/ie_Coll_GKE_0_GKI_0_ITEST_3_IBACK_3_Pmaxe_',num2str(cmat_pmaxe),...
+        '_Jmaxe_',num2str(cmat_jmaxe),'_Pmaxi_',num2str(cmat_pmaxi),'_Jmaxi_',...
+        num2str(cmat_jmaxi),'_JE_12_tau_1.0000_mu_0.0233.h5'''];
+elseif (CO == 2) % Write matrice filename for Sugama GK
+    cmat_pmaxe = 10;
+    cmat_jmaxe = 5;
+    cmat_pmaxi = 10;
+    cmat_jmaxi = 5;
+    INITIAL.selfmat_file = ...
+        ['''../../../iCa/self_Coll_GKE_1_GKI_1_ESELF_3_ISELF_3_Pmaxe_',num2str(cmat_pmaxe),...
+        '_Jmaxe_',num2str(cmat_jmaxe),'_Pmaxi_',num2str(cmat_pmaxi),'_Jmaxi_',...
+        num2str(cmat_jmaxi),'_JE_12_NFLR_5_'''];
+    INITIAL.eimat_file = ...
+        ['''../../../iCa/ei_Coll_GKE_1_GKI_1_ETEST_3_EBACK_3_Pmaxe_',num2str(cmat_pmaxe),...
+        '_Jmaxe_',num2str(cmat_jmaxe),'_Pmaxi_',num2str(cmat_pmaxi),'_Jmaxi_',...
+        num2str(cmat_jmaxi),'_JE_12_tau_1.0000_mu_0.0233_NFLRe_5_NFLRi_5_'''];
+    INITIAL.iemat_file = ...
+        ['''../../../iCa/ie_Coll_GKE_1_GKI_1_ITEST_3_IBACK_3_Pmaxe_',num2str(cmat_pmaxe),...
+        '_Jmaxe_',num2str(cmat_jmaxe),'_Pmaxi_',num2str(cmat_pmaxi),'_Jmaxi_',...
+        num2str(cmat_jmaxi),'_JE_12_tau_1.0000_mu_0.0233_NFLRe_5_NFLRi_5_'''];
+elseif (CO == 3) % Full Coulomb GK
+    disp('Warning, FCGK not implemented yet')
+elseif (CO == -1) % DGDK
+    disp('Warning, DGDK not debugged')
+end
+
 % Naming and creating input file
-if    (CO == 0); CONAME = 'LB';
-elseif(CO == -1); CONAME = 'FC';
-elseif(CO == -2); CONAME = 'DG';
-elseif(CO == -3); CONAME = 'DGGK';
+if    (CO == -3); CONAME = 'FCDK';
+elseif(CO == -2); CONAME = 'SGDK';
+elseif(CO == -1); CONAME = 'DGDK';
+elseif(CO ==  0); CONAME = 'LB';
+elseif(CO ==  1); CONAME = 'DGGK';
+elseif(CO ==  2); CONAME = 'SGGK';
+elseif(CO ==  3); CONAME = 'FCGK';
 end
 if    (CLOS == 0); CLOSNAME = 'Trunc.';
 elseif(CLOS == 1); CLOSNAME = 'Clos. 1';