diff --git a/feedstock/iids.yaml b/feedstock/iids.yaml
index 1ad3e4d..c3e68a6 100644
--- a/feedstock/iids.yaml
+++ b/feedstock/iids.yaml
@@ -1,65 +1,67 @@
-    # from https://github.com/Timh37/CMIP6cex/issues/2
-    # - "CMIP6.*.*.*.[historical, ssp245, ssp585].*.day.[psl, pr, sfcWind].*.*"
-    # from https://github.com/leap-stc/cmip6-leap-feedstock/issues/144
-    - 'CMIP6.HighResMIP.CMCC.CMCC-CM2-VHR4.[hist-1950,highres-future].r1i1p1f1.6hrPlevPt.[vas,uas,psl].gn.*'
-    - 'CMIP6.HighResMIP.EC-Earth-Consortium.EC-Earth3P-HR.[hist-1950,highres-future].r1i1p2f1.6hrPlevPt.[vas,uas,psl].gr.*'
-    - 'CMIP6.HighResMIP.MOHC.HadGEM3-GC31-HM.[hist-1950,highres-future].r1i1p1f1.[3hr, E3hr].[vas,uas,psl].gn.*'
-    # From https://github.com/leap-stc/cmip6-leap-feedstock/issues/116
-    - "CMIP6.CMIP.MPI-M.MPI-ESM1-2-HR.historical.r1i1p1f1.Amon.tas.gn.*"
-    # from https://github.com/pangeo-forge/cmip6-feedstock/issues/22
-    - "CMIP6.*.*.*.[historical, ssp126, ssp245, ssp585].*.Omon.zmeso.*.*"
-    # PMIP velocities
-    - 'CMIP6.PMIP.*.*.lgm.*.[Omon, Odec].[uo, vo].*.*'
-    # from https://github.com/leap-stc/cmip6-leap-feedstock/issues/41
-    - "CMIP6.*.*.*.[historical, ssp126, ssp245, ssp585].*.SImon.[sifb,siitdthick].*.*"
-    # for CMIP6 pco2 testbed (these got stuck in the client somehow)
-    - "CMIP6.*.*.*.[historical, ssp245].*.Omon.[spco2, dpco2,tos,sos,chl,mlotst].*.*"
-    # from https://github.com/leap-stc/cmip6-leap-feedstock/issues/72
-    - "CMIP6.HighResMIP.MOHC.HadGEM3-GC31-HH.[highres-future,hist-1950].r1i1p1f1.Omon.[thetao,so].gn.*"
-    # # From https://github.com/leap-stc/cmip6-leap-feedstock/issues/101 (waiting until we have better download logic)
-    # - "CMIP6.CMIP.CSIRO-ARCCSS.ACCESS-CM2.historical.r4i1p1f1.3hr.pr.gn.v20210607"
-    # - "CMIP6.CMIP.CSIRO-ARCCSS.ACCESS-CM2.historical.r4i1p1f1.6hrLev.hus.gn.v20210921"
-    # - "CMIP6.CMIP.CSIRO.ACCESS-ESM1-5.historical.r1i1p1f1.3hr.pr.gn.v20191115"
-    # - "CMIP6.CMIP.CSIRO.ACCESS-ESM1-5.historical.r1i1p1f1.6hrLev.ta.gn.v20191115"
-    # - "CMIP6.CMIP.CSIRO.ACCESS-ESM1-5.historical.r1i1p1f1.6hrLev.hus.gn.v20191115"
-    # - "CMIP6.CMIP.AWI.AWI-ESM-1-1-LR.historical.r1i1p1f1.3hr.pr.gn.v20200212"
-    # - "CMIP6.CMIP.AWI.AWI-ESM-1-1-LR.historical.r1i1p1f1.6hrLev.ta.gn.v20200212"
-    # - "CMIP6.CMIP.AWI.AWI-ESM-1-1-LR.historical.r1i1p1f1.6hrLev.hus.gn.v20200212"
-    # - "CMIP6.CMIP.NCAR.CESM2.historical.r11i1p1f1.E1hr.pr.gn.v20190514"
-    # - "CMIP6.CMIP.NCAR.CESM2.historical.r11i1p1f1.6hrLev.ta.gn.v20200210"
-    # - "CMIP6.CMIP.CMCC.CMCC-CM2-SR5.historical.r1i1p1f1.3hr.pr.gn.v20200616"
-    # - "CMIP6.CMIP.CMCC.CMCC-CM2-SR5.historical.r1i1p1f1.6hrLev.ta.gn.v20200616"
-    # - "CMIP6.CMIP.CMCC.CMCC-CM2-SR5.historical.r1i1p1f1.6hrLev.hus.gn.v20200616"
-    # - "CMIP6.CMIP.CMCC.CMCC-ESM2.historical.r1i1p1f1.3hr.pr.gn.v20210114"
-    # - "CMIP6.CMIP.CMCC.CMCC-ESM2.historical.r1i1p1f1.6hrLev.ta.gn.v20210114"
-    # - "CMIP6.CMIP.CMCC.CMCC-ESM2.historical.r1i1p1f1.6hrLev.hus.gn.v20210114"
-    # - "CMIP6.CMIP.CCCma.CanESM5.historical.r1i1p2f1.3hr.pr.gn.v20190429"
-    # - "CMIP6.CMIP.CAS.FGOALS-g3.historical.r1i1p1f1.3hr.pr.gn.v20190826"
-    # - "CMIP6.CMIP.CAS.FGOALS-g3.historical.r1i1p1f1.6hrLev.ta.gn.v20190826"
-    # - "CMIP6.CMIP.CAS.FGOALS-g3.historical.r1i1p1f1.6hrLev.hus.gn.v20190826"
-    # - "CMIP6.CMIP.MOHC.HadGEM3-GC31-LL.historical.r1i1p1f3.3hr.pr.gn.v20201103"
-    # - "CMIP6.CMIP.MOHC.HadGEM3-GC31-MM.historical.r1i1p1f3.3hr.pr.gn.v20200720"
-    # - "CMIP6.CMIP.MOHC.HadGEM3-GC31-MM.historical.r1i1p1f3.6hrLev.ta.gn.v20201019"
-    # - "CMIP6.CMIP.MOHC.HadGEM3-GC31-MM.historical.r1i1p1f3.6hrLev.hus.gn.v20201019"
-    # - "CMIP6.CMIP.CCCR-IITM.IITM-ESM.historical.r1i1p1f1.3hr.pr.gn.v20191226"
-    # - "CMIP6.CMIP.CCCR-IITM.IITM-ESM.historical.r1i1p1f1.6hrLev.ta.gn.v20191226"
-    # - "CMIP6.CMIP.CCCR-IITM.IITM-ESM.historical.r1i1p1f1.6hrLev.hus.gn.v20191226"
-    # - "CMIP6.CMIP.MIROC.MIROC-ES2L.historical.r1i1p1f2.3hr.pr.gn.v20191129"
-    # - "CMIP6.CMIP.MIROC.MIROC-ES2L.historical.r1i1p1f2.6hrLev.ta.gn.v20191129"
-    # - "CMIP6.CMIP.MIROC.MIROC-ES2L.historical.r1i1p1f2.6hrLev.hus.gn.v20191129"
-    # - "CMIP6.CMIP.MIROC.MIROC6.historical.r1i1p1f1.3hr.pr.gn.v20190912"
-    # - "CMIP6.CMIP.HAMMOZ-Consortium.MPI-ESM-1-2-HAM.historical.r1i1p1f1.3hr.pr.gn.v20190627"
-    # - "CMIP6.CMIP.HAMMOZ-Consortium.MPI-ESM-1-2-HAM.historical.r1i1p1f1.6hrLev.ta.gn.v20190627"
-    # - "CMIP6.CMIP.HAMMOZ-Consortium.MPI-ESM-1-2-HAM.historical.r1i1p1f1.6hrLev.hus.gn.v20190627"
-    # - "CMIP6.CMIP.MPI-M.MPI-ESM1-2-LR.historical.r1i1p1f1.3hr.pr.gn.v20190710"
-    # - "CMIP6.CMIP.MPI-M.MPI-ESM1-2-HR.historical.r1i1p1f1.3hr.pr.gn.v20190710"
-    # - "CMIP6.CMIP.NUIST.NESM3.historical.r1i1p1f1.3hr.pr.gn.v20190630"
-    # - "CMIP6.CMIP.NCC.NorESM2-MM.historical.r1i1p1f1.3hr.pr.gn.v20230616"
-    # - "CMIP6.CMIP.NCC.NorESM2-MM.historical.r1i1p1f1.6hrLev.ta.gn.v20191108"
-    # - "CMIP6.CMIP.NCC.NorESM2-MM.historical.r1i1p1f1.6hrLev.hus.gn.v20191108"
-    # - "CMIP6.CMIP.SNU.SAM0-UNICON.historical.r1i1p1f1.3hr.pr.gn.v20190323"
-    # - "CMIP6.CMIP.AS-RCEC.TaiESM1.historical.r1i1p1f1.3hr.pr.gn.v20201013"
-    # - "CMIP6.CMIP.AS-RCEC.TaiESM1.historical.r1i1p1f1.6hrLev.ta.gn.v20201112"
-    # - "CMIP6.CMIP.AS-RCEC.TaiESM1.historical.r1i1p1f1.6hrLev.hus.gn.v202011"
-    # From  https://github.com/leap-stc/cmip6-leap-feedstock/issues/123
-    - "CMIP6.HighResMIP.*.*.[highresSST-present,hist-1950].*.Amon.[pr, ts].gn.*"
+    # # from https://github.com/Timh37/CMIP6cex/issues/2
+    # # - "CMIP6.*.*.*.[historical, ssp245, ssp585].*.day.[psl, pr, sfcWind].*.*"
+    # # from https://github.com/leap-stc/cmip6-leap-feedstock/issues/144
+    # - 'CMIP6.HighResMIP.CMCC.CMCC-CM2-VHR4.[hist-1950,highres-future].r1i1p1f1.6hrPlevPt.[vas,uas,psl].gn.*'
+    # - 'CMIP6.HighResMIP.EC-Earth-Consortium.EC-Earth3P-HR.[hist-1950,highres-future].r1i1p2f1.6hrPlevPt.[vas,uas,psl].gr.*'
+    # - 'CMIP6.HighResMIP.MOHC.HadGEM3-GC31-HM.[hist-1950,highres-future].r1i1p1f1.[3hr, E3hr].[vas,uas,psl].gn.*'
+    # # From https://github.com/leap-stc/cmip6-leap-feedstock/issues/116
+    # - "CMIP6.CMIP.MPI-M.MPI-ESM1-2-HR.historical.r1i1p1f1.Amon.tas.gn.*"
+    # # from https://github.com/pangeo-forge/cmip6-feedstock/issues/22
+    # - "CMIP6.*.*.*.[historical, ssp126, ssp245, ssp585].*.Omon.zmeso.*.*"
+    # # PMIP velocities
+    # - 'CMIP6.PMIP.*.*.lgm.*.[Omon, Odec].[uo, vo].*.*'
+    # # from https://github.com/leap-stc/cmip6-leap-feedstock/issues/41
+    # - "CMIP6.*.*.*.[historical, ssp126, ssp245, ssp585].*.SImon.[sifb,siitdthick].*.*"
+    # # for CMIP6 pco2 testbed (these got stuck in the client somehow)
+    # - "CMIP6.*.*.*.[historical, ssp245].*.Omon.[spco2, dpco2,tos,sos,chl,mlotst].*.*"
+    # # from https://github.com/leap-stc/cmip6-leap-feedstock/issues/72
+    # - "CMIP6.HighResMIP.MOHC.HadGEM3-GC31-HH.[highres-future,hist-1950].r1i1p1f1.Omon.[thetao,so].gn.*"
+    # # # From https://github.com/leap-stc/cmip6-leap-feedstock/issues/101 (waiting until we have better download logic)
+    # # - "CMIP6.CMIP.CSIRO-ARCCSS.ACCESS-CM2.historical.r4i1p1f1.3hr.pr.gn.v20210607"
+    # # - "CMIP6.CMIP.CSIRO-ARCCSS.ACCESS-CM2.historical.r4i1p1f1.6hrLev.hus.gn.v20210921"
+    # # - "CMIP6.CMIP.CSIRO.ACCESS-ESM1-5.historical.r1i1p1f1.3hr.pr.gn.v20191115"
+    # # - "CMIP6.CMIP.CSIRO.ACCESS-ESM1-5.historical.r1i1p1f1.6hrLev.ta.gn.v20191115"
+    # # - "CMIP6.CMIP.CSIRO.ACCESS-ESM1-5.historical.r1i1p1f1.6hrLev.hus.gn.v20191115"
+    # # - "CMIP6.CMIP.AWI.AWI-ESM-1-1-LR.historical.r1i1p1f1.3hr.pr.gn.v20200212"
+    # # - "CMIP6.CMIP.AWI.AWI-ESM-1-1-LR.historical.r1i1p1f1.6hrLev.ta.gn.v20200212"
+    # # - "CMIP6.CMIP.AWI.AWI-ESM-1-1-LR.historical.r1i1p1f1.6hrLev.hus.gn.v20200212"
+    # # - "CMIP6.CMIP.NCAR.CESM2.historical.r11i1p1f1.E1hr.pr.gn.v20190514"
+    # # - "CMIP6.CMIP.NCAR.CESM2.historical.r11i1p1f1.6hrLev.ta.gn.v20200210"
+    # # - "CMIP6.CMIP.CMCC.CMCC-CM2-SR5.historical.r1i1p1f1.3hr.pr.gn.v20200616"
+    # # - "CMIP6.CMIP.CMCC.CMCC-CM2-SR5.historical.r1i1p1f1.6hrLev.ta.gn.v20200616"
+    # # - "CMIP6.CMIP.CMCC.CMCC-CM2-SR5.historical.r1i1p1f1.6hrLev.hus.gn.v20200616"
+    # # - "CMIP6.CMIP.CMCC.CMCC-ESM2.historical.r1i1p1f1.3hr.pr.gn.v20210114"
+    # # - "CMIP6.CMIP.CMCC.CMCC-ESM2.historical.r1i1p1f1.6hrLev.ta.gn.v20210114"
+    # # - "CMIP6.CMIP.CMCC.CMCC-ESM2.historical.r1i1p1f1.6hrLev.hus.gn.v20210114"
+    # # - "CMIP6.CMIP.CCCma.CanESM5.historical.r1i1p2f1.3hr.pr.gn.v20190429"
+    # # - "CMIP6.CMIP.CAS.FGOALS-g3.historical.r1i1p1f1.3hr.pr.gn.v20190826"
+    # # - "CMIP6.CMIP.CAS.FGOALS-g3.historical.r1i1p1f1.6hrLev.ta.gn.v20190826"
+    # # - "CMIP6.CMIP.CAS.FGOALS-g3.historical.r1i1p1f1.6hrLev.hus.gn.v20190826"
+    # # - "CMIP6.CMIP.MOHC.HadGEM3-GC31-LL.historical.r1i1p1f3.3hr.pr.gn.v20201103"
+    # # - "CMIP6.CMIP.MOHC.HadGEM3-GC31-MM.historical.r1i1p1f3.3hr.pr.gn.v20200720"
+    # # - "CMIP6.CMIP.MOHC.HadGEM3-GC31-MM.historical.r1i1p1f3.6hrLev.ta.gn.v20201019"
+    # # - "CMIP6.CMIP.MOHC.HadGEM3-GC31-MM.historical.r1i1p1f3.6hrLev.hus.gn.v20201019"
+    # # - "CMIP6.CMIP.CCCR-IITM.IITM-ESM.historical.r1i1p1f1.3hr.pr.gn.v20191226"
+    # # - "CMIP6.CMIP.CCCR-IITM.IITM-ESM.historical.r1i1p1f1.6hrLev.ta.gn.v20191226"
+    # # - "CMIP6.CMIP.CCCR-IITM.IITM-ESM.historical.r1i1p1f1.6hrLev.hus.gn.v20191226"
+    # # - "CMIP6.CMIP.MIROC.MIROC-ES2L.historical.r1i1p1f2.3hr.pr.gn.v20191129"
+    # # - "CMIP6.CMIP.MIROC.MIROC-ES2L.historical.r1i1p1f2.6hrLev.ta.gn.v20191129"
+    # # - "CMIP6.CMIP.MIROC.MIROC-ES2L.historical.r1i1p1f2.6hrLev.hus.gn.v20191129"
+    # # - "CMIP6.CMIP.MIROC.MIROC6.historical.r1i1p1f1.3hr.pr.gn.v20190912"
+    # # - "CMIP6.CMIP.HAMMOZ-Consortium.MPI-ESM-1-2-HAM.historical.r1i1p1f1.3hr.pr.gn.v20190627"
+    # # - "CMIP6.CMIP.HAMMOZ-Consortium.MPI-ESM-1-2-HAM.historical.r1i1p1f1.6hrLev.ta.gn.v20190627"
+    # # - "CMIP6.CMIP.HAMMOZ-Consortium.MPI-ESM-1-2-HAM.historical.r1i1p1f1.6hrLev.hus.gn.v20190627"
+    # # - "CMIP6.CMIP.MPI-M.MPI-ESM1-2-LR.historical.r1i1p1f1.3hr.pr.gn.v20190710"
+    # # - "CMIP6.CMIP.MPI-M.MPI-ESM1-2-HR.historical.r1i1p1f1.3hr.pr.gn.v20190710"
+    # # - "CMIP6.CMIP.NUIST.NESM3.historical.r1i1p1f1.3hr.pr.gn.v20190630"
+    # # - "CMIP6.CMIP.NCC.NorESM2-MM.historical.r1i1p1f1.3hr.pr.gn.v20230616"
+    # # - "CMIP6.CMIP.NCC.NorESM2-MM.historical.r1i1p1f1.6hrLev.ta.gn.v20191108"
+    # # - "CMIP6.CMIP.NCC.NorESM2-MM.historical.r1i1p1f1.6hrLev.hus.gn.v20191108"
+    # # - "CMIP6.CMIP.SNU.SAM0-UNICON.historical.r1i1p1f1.3hr.pr.gn.v20190323"
+    # # - "CMIP6.CMIP.AS-RCEC.TaiESM1.historical.r1i1p1f1.3hr.pr.gn.v20201013"
+    # # - "CMIP6.CMIP.AS-RCEC.TaiESM1.historical.r1i1p1f1.6hrLev.ta.gn.v20201112"
+    # # - "CMIP6.CMIP.AS-RCEC.TaiESM1.historical.r1i1p1f1.6hrLev.hus.gn.v202011"
+    # # From  https://github.com/leap-stc/cmip6-leap-feedstock/issues/123
+    # - "CMIP6.HighResMIP.*.*.[highresSST-present,hist-1950].*.Amon.[pr, ts].gn.*"
+    # For m2lines/ocean_emulators
+    - "CMIP6.*.*.GFDL-CM4.piControl.*.[Amon, Omon].[uo, vo, thetao, so, zos, tauuo, tauvo, hfss, hfls].gn.*"