diff --git a/code/classes/SCDclass_expcode.m b/code/classes/SCDclass_expcode.m
index 5543496c62b4224f3ae9a95f6bc7a81b97a87f3c..0079b8fec80c3760b75777c84dcdc54f6484afe4 100644
--- a/code/classes/SCDclass_expcode.m
+++ b/code/classes/SCDclass_expcode.m
@@ -159,9 +159,7 @@ classdef SCDclass_expcode
            obj.setupnodedd;
            obj.setupmaindd;
            
-           fprintf('Setting up variant model configuration')
-           obj.setupvaralgo;
-
+           
            fprintf('Setting up expcode %d, ''%s'', configuring default tunable parameters ...\n',obj.maincode,obj.name);           
            obj.updatedefaulttp;
            fprintf('Setting up expcode %d, ''%s'', configuring global data ...\n',obj.maincode,obj.name);
@@ -197,7 +195,14 @@ classdef SCDclass_expcode
             dd.addDataSource(mydatasource);
           end
           % Set up RFM bus
+          fprintf('Setting up RFM main bus\n')
           addRFMbus(obj,dd)
+
+          fprintf('Setting up variant model configuration')
+          obj.setupvaralgo;
+          
+          dd.saveChanges;
+
         end
         
         function actualize(obj, shot, varargin)
@@ -463,7 +468,7 @@ classdef SCDclass_expcode
             parse(p,varargin{:});
             myddname = p.Results.ddname;
             
-            dim=obj.mdscontainer.printMARTe2wgbusconfig(shot, myddname, busname, frequency);               
+            obj.mdscontainer.printMARTe2wgbusconfig(shot, myddname, busname, frequency);               
         end
 
         function printparameters(obj)
@@ -693,8 +698,7 @@ classdef SCDclass_expcode
         function setupnodedd(obj)
             % For every node, add required wrapper datadicationaries as
             % sources for the main data dicationary
-            
-            
+
             % Getting main data dictionary and required data sources
             datadictname = obj.ddname;
             fprintf('opening %s\n',datadictname)