diff --git a/gdat.m b/gdat.m
index a0943271992a520ce9e1f02c4db2818e2830f0f7..236cdbe21294aa1b65df4b31406f699865947ee2 100644
--- a/gdat.m
+++ b/gdat.m
@@ -109,13 +109,15 @@ end
 doplot=0;
 if (nargineff>=3 & ~isempty(varargin{1})); doplot=varargin{1}; end
 machine='TCV';
-a=which('sawteeth');
+a=which('gdat');
 if ~isempty(findstr('ipp',a)) | ~isempty(findstr('/u/osauter',a));
   machine='AUG';
   global usemdsplus; % so far from AUG, do not use mdsplus
   usemdsplus=0;
 elseif ~isempty(findstr('/home/osauter',a));
   machine='JET';
+elseif ~isempty(findstr('/u/sauter',a));
+  machine='D3D';
 end
 if (nargineff>=4 & ~isempty(varargin{2})); machine=varargin{2}; end
 
@@ -127,7 +129,7 @@ else
 end
 
 % PLOT DATA (if required)
-if doplot==1 & length(trace.data)>1
+if doplot==1 & length(trace.data)>1 & ~ischar(trace.data)
   figure;zoom on
   if length(size(trace.data))<=2
     plot(trace.t,trace.data);
diff --git a/gdatpaths.m b/gdatpaths.m
index a14d9c3748be173c5a0a0c7be174ceed323a1048..4c8d831307bed860558d217aee865bea81f7dac4 100644
--- a/gdatpaths.m
+++ b/gdatpaths.m
@@ -7,7 +7,7 @@ a=which('gdat');
 ii=findstr('/',a);
 a=a(1:ii(end));
 
-machines=[{'JET'} {'TCV'} {'AUG'}];
+machines=[{'JET'} {'TCV'} {'AUG'} {'D3D'}];
 
 for i=1:length(machines)
   addpath([a machines{i}])