diff --git a/crpptbx/D3D/gdat_d3d.m b/crpptbx/D3D/gdat_d3d.m
index 785563bdaee7f24c254c03eaae119ce4523326bd..ba9f650521ca3aab70fa375feceafd1ee2226568 100644
--- a/crpptbx/D3D/gdat_d3d.m
+++ b/crpptbx/D3D/gdat_d3d.m
@@ -67,7 +67,7 @@ default_machine = 'd3d';
 
 gdat_params.machine=default_machine;
 gdat_params.doplot = 0;
-gdat_params.exp_name = 'D3DD';
+gdat_params.exp_name = 'D3D';
 gdat_params.nverbose = 1;
 
 % construct list of keywords from global set of keywords and specific D3D set
@@ -257,7 +257,11 @@ if strcmp(mapping_for_d3d.method,'signal')
     mapping_for_d3d.expression{1} = gdat_data.gdat_params.source;
   end
   shoteff = [];
-  aa=mdscurrent;
+  if exist('mdscurrent') > 0
+    aa=mdscurrent;
+  else
+    aa='will connect';
+  end
   if ~isempty(shot)
     if isempty(aa) && mdsremotelist==0 && any(findstr('epfl',getenv('HOSTNAME')))
       mdsconnect('localhost:5556');
@@ -708,6 +712,7 @@ elseif strcmp(mapping_for_d3d.method,'switchcase')
       gdat_data.gdat_params.source = 'efit03';
     else
     end
+    gdat_data.gdat_params.equil = gdat_data.gdat_params.source;
     if exist('read_mds_eq_func')<=0
       if gdat_params.nverbose>=3; disp(['addpath(''/m/GAtools/matlab/efit'',''end'') since needs function read_mds_eq_func']); end
       addpath('/m/GAtools/matlab/efit','end');