diff --git a/matlab/D3D/d3d_requests_mapping.m b/matlab/D3D/d3d_requests_mapping.m
index b58209b9b85675c19cf6070e39054e37a7c38a5b..8eb80c6cbd70ab8405269fff92b77b90d362c98d 100644
--- a/matlab/D3D/d3d_requests_mapping.m
+++ b/matlab/D3D/d3d_requests_mapping.m
@@ -114,11 +114,12 @@ switch lower(data_request)
   mapping.label = 'Halpha';
   mapping.method = 'signal';
   mapping.expression = [{'SPECTROSCOPY'},{'\fs04'}];
- case 'h_scalings'
+ case {'h_scalings', 'h98y2'}
   mapping.label = 'H_{98y2}';
   mapping.timedim = 1;
   mapping.method = 'signal';
   mapping.expression = [{'EFIT01'},{'results.confinement.times.scalings:h_thh98y2'}];
+  mapping.expression = [{'D3D'},{'\h_thh98y2'}];
  case 'ioh'
   mapping.timedim = 1;
   mapping.label = 'I ohmic transformer';
diff --git a/matlab/D3D/gdat_d3d.m b/matlab/D3D/gdat_d3d.m
index f7a04a72629da63f71440f92bff79eae16a1ea29..be93b4192db0e98d6f89d6c21554d6a54af0d7d2 100644
--- a/matlab/D3D/gdat_d3d.m
+++ b/matlab/D3D/gdat_d3d.m
@@ -1099,8 +1099,10 @@ elseif strcmp(mapping_for_d3d.method,'switchcase')
     %  powers, frequencies, etc 
     params_eff = gdat_data.gdat_params;
     params_eff.data_request={'rf'  '\echpwrc'};
-    gyro_names={'leia','luke','scarecrow','tinman','chewbacca','nasa'};
-    power_names={'ecleifpwrc','eclukfpwrc','ecscafpwrc','ectinfpwrc','ecchefpwrc','ecnasfpwrc'};
+% $$$     gyro_names={'leia','luke','scarecrow','tinman','chewbacca','nasa'};
+% $$$     power_names={'ecleifpwrc','eclukfpwrc','ecscafpwrc','ectinfpwrc','ecchefpwrc','ecnasfpwrc'};
+    gyro_names={'leia','luke','r2d2','yoda','han'};
+    power_names={'ecleifpwrc','eclukfpwrc','ecr2dfpwrc','ecyodfpwrc','echanfpwrc'};
     % pgyro tot in index=length(gyro_names)+1
     try
       gdat_data=gdat_d3d(shot,params_eff);
@@ -1247,7 +1249,7 @@ elseif strcmp(mapping_for_d3d.method,'switchcase')
     % total of each source in .data, but full data in subfield like pgyro in .ec, to check for nbi
     params_eff = gdat_data.gdat_params;
     % ohmic, use its time-base
-    params_eff.data_request={'EFIT03','\vloopmhd'}; %poh too noisy even if vloop*ip is not quite correct
+    params_eff.data_request={'EFIT01','\vloopmhd'}; %poh too noisy even if vloop*ip is not quite correct
     try
       ohm=gdat_d3d(shot,params_eff);
     catch