diff --git a/modules/aeolus/aeolus_amv.py b/modules/aeolus/aeolus_amv.py
index 9824fdc6e54282683683760887e840af1039e4d5..969fd0a8ea322f0dc6143e800d2688c43d84329d 100644
--- a/modules/aeolus/aeolus_amv.py
+++ b/modules/aeolus/aeolus_amv.py
@@ -1777,6 +1777,12 @@ def match_calipso_clavrx_to_amvs(calipso_clavrx_path, calipso_clavrx_file, amv_f
 
     amv_ds.close()
 
+    calipso_clavrx_params = ['closest_calipso_top_alt', 'closest_calipso_base_alt', 'cld_height_acha', 'cld_height_base_acha']
+    coords_a = {'num_calipso_clavrx_params': calipso_clavrx_params}
+    dims_a = ['num_calipso_clavrx_params']
+    calipso_clavrx_data = []
+    for pname in calipso_clavrx_params:
+        calipso_clavrx_data.append(calipso_clavrx_nc4[pname][:])
     xs = calipso_clavrx_nc4['x'][:]
     ys = calipso_clavrx_nc4['y'][:]
     clvr_xy_s = zip(xs, ys)
@@ -1797,7 +1803,11 @@ def match_calipso_clavrx_to_amvs(calipso_clavrx_path, calipso_clavrx_file, amv_f
         param_nd = np.vstack(param_s)
         param_nd = param_nd[:, in_box]
         amvs_da = xr.DataArray(param_nd, coords=coords, dims=dims)
-        match_dict[nom_time].append((cc, ll, f_idx, None, amvs_da))
+
+        data_nd = np.vstack(calipso_clavrx_data)
+        data_da = xr.DataArray(data_nd[:, idx], coords=coords_a, dims=dims_a)
+
+        match_dict[nom_time].append((cc, ll, f_idx, data_da, amvs_da))
 
     return match_dict