diff --git a/CHANGELOG.md b/CHANGELOG.md
index cbab319..3b64875 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- Added remapping for GEOS-IT restarts 
 - Added new res C1120 
 - NOTE: If running on SLES15 remap tests will not be zero diff for GOCART RST but are zero diff for all other
 
diff --git a/pre/remap_restart/remap_analysis.py b/pre/remap_restart/remap_analysis.py
index 96d3895..ddf85ae 100755
--- a/pre/remap_restart/remap_analysis.py
+++ b/pre/remap_restart/remap_analysis.py
@@ -23,7 +23,10 @@
 class analysis(remap_base):
   def __init__(self, **configs):
      super().__init__(**configs)
-     self.copy_merra2()
+     if self.config['input']['shared']['MERRA-2']:
+        self.copy_merra2()
+     if self.config['input']['shared']['GEOS-IT']:
+        self.copy_geosit()
 
   def remap(self):
      config = self.config
@@ -125,7 +128,8 @@ def remap(self):
      print( "cd " + cwdir)
      os.chdir(cwdir)
 
-     self.remove_merra2()
+     if self.config['input']['shared']['MERRA-2']:
+        self.remove_merra2()
 
   def get_grid_kind(this, grid):
      hgrd = {}
@@ -243,3 +247,4 @@ def copy_merra2(self):
 if __name__ == '__main__' :
    ana = analysis(params_file='remap_params.yaml')
    ana.remap()
+   ana.remove_geosit()
diff --git a/pre/remap_restart/remap_base.py b/pre/remap_restart/remap_base.py
index d018911..70de50e 100755
--- a/pre/remap_restart/remap_base.py
+++ b/pre/remap_restart/remap_base.py
@@ -33,6 +33,10 @@ def remove_merra2(self):
     if self.config['input']['shared']['MERRA-2']:
       print(" remove temporary folder that contains MERRA-2 archived files ... \n")
       subprocess.call(['/bin/rm', '-rf', self.config['input']['shared']['rst_dir']])
+  def remove_geosit(self):
+    if self.config['input']['shared']['GEOS-IT']:
+      print(" remove temporary folder that contains GEOS-IT archived files ... \n")
+      subprocess.call(['/bin/rm', '-rf', self.config['input']['shared']['rst_dir']])
 
   def copy_without_remap(self, restarts_in, compared_file_in, compared_file_out, suffix, catch=False):
 #
@@ -89,3 +93,60 @@ def copy_without_remap(self, restarts_in, compared_file_in, compared_file_out, s
        return True
 
      return False
+
+  def copy_geosit(self):
+    if not self.config['input']['shared']['GEOS-IT']:
+        return 
+     
+    expid = self.config['input']['shared']['expid']
+    yyyymmddhh_ = str(self.config['input']['shared']['yyyymmddhh'])
+    yyyy_ = yyyymmddhh_[0:4]
+    mm_   = yyyymmddhh_[4:6]
+    day_  = yyyymmddhh_[6:8]  # Extract the day from yyyymmddhh_
+          
+    time_suffix = '_21z' 
+    time_suffix_nc4 = '_2100z' 
+        
+    geos_it_rst_dir = '/discover/nobackup/projects/gmao/geos-it/dao_ops/archive/' + expid + '/rs/Y' + yyyy_ + '/M' + mm_ + '/'
+    rst_dir = self.config['input']['shared']['rst_dir'] + '/'
+    os.makedirs(rst_dir, exist_ok=True)
+             
+    print('Stage GEOS-IT restarts \n from \n    ' + geos_it_rst_dir + '\n to\n    ' + rst_dir + '\n')
+
+    # Only use the specific day from yyyymmddhh_
+    filename = f'{expid}.rst.{yyyy_}{mm_}{day_}{time_suffix}.tar'
+    src_file = os.path.join(geos_it_rst_dir, filename)
+    dest_file = os.path.join(rst_dir, filename)
+    if os.path.exists(dest_file):
+       print('tar file is copied and untar, no need to copy')
+       return
+    if os.path.exists(src_file):
+       print(f"Copying file {src_file} to {dest_file}")
+       shutil.copy(src_file, dest_file)
+
+       # Untar the .tar file using the tar command
+       if os.path.exists(dest_file):
+           print(f"Untarring {dest_file} to {rst_dir}")
+           try:
+               subprocess.run(['tar', '-xf', dest_file, '-C', rst_dir], check=True)
+               print(f"Untarred {dest_file} successfully.")
+           except subprocess.CalledProcessError as e:
+               print(f"Error untarring {dest_file}: {e}")
+
+        # Optionally remove the tar file after extraction
+        #os.remove(dest_file)
+    else:
+       print(f"Tar file {src_file} does not exist.")
+
+    # Now handle the additional .nc4 file
+    cp_agcm_import_rst = self.config['output']['air']['agcm_import_rst']
+    if (cp_agcm_import_rst) :
+       nc4_filename = f'{expid}.agcm_import_rst.{yyyy_}{mm_}{day_}{time_suffix_nc4}.nc4'
+       src_nc4_file = os.path.join(geos_it_rst_dir, nc4_filename)
+       dest_nc4_file = os.path.join(rst_dir, nc4_filename)
+       # Copy the .nc4 file if it exists
+       if os.path.exists(src_nc4_file):
+          print(f"Copying .nc4 file {src_nc4_file} to {dest_nc4_file}")
+          shutil.copy(src_nc4_file, dest_nc4_file)
+       else:
+          print(f" agcm_import_rst file {src_nc4_file} does not exist.")
diff --git a/pre/remap_restart/remap_catchANDcn.py b/pre/remap_restart/remap_catchANDcn.py
index 8481707..c5802e2 100755
--- a/pre/remap_restart/remap_catchANDcn.py
+++ b/pre/remap_restart/remap_catchANDcn.py
@@ -23,7 +23,10 @@
 class catchANDcn(remap_base):
   def __init__(self, **configs):
      super().__init__(**configs)
-     self.copy_merra2()
+     if self.config['input']['shared']['MERRA-2']:
+        self.copy_merra2()
+     if self.config['input']['shared']['GEOS-IT']:
+        self.copy_geosit()
 
   def remap(self):
      if not self.config['output']['surface']['remap_catch']:
@@ -222,7 +225,8 @@ def remap(self):
      print( "cd " + cwdir)
      os.chdir(cwdir)
 
-     self.remove_merra2()
+     if self.config['input']['shared']['MERRA-2']:
+        self.remove_merra2()
 
   def copy_merra2(self):
     if not self.config['input']['shared']['MERRA-2']:
@@ -342,7 +346,7 @@ def has_catch_rst(text):
         {
             "type": "select",
             "name": "output:shared:ogrid",
-            "message": message_ogrid_in,
+            "message": message_ogrid_new,
             "choices": choices_ogrid_data,
             "default": lambda x: data_ocean_default(x.get('output:shared:agrid')),
             "when": lambda x : x['output:surface:EASE_grid'] == 'Cubed-Sphere',
@@ -436,8 +440,7 @@ def remap_land_only():
 
    catch = catchANDcn(params_file=config_yaml)
    catch.remap()
-
-
+   catch.remove_geosit()
 
 if __name__ == '__main__' :
 
diff --git a/pre/remap_restart/remap_command_line.py b/pre/remap_restart/remap_command_line.py
index 9b59632..8a8ea85 100755
--- a/pre/remap_restart/remap_command_line.py
+++ b/pre/remap_restart/remap_command_line.py
@@ -39,6 +39,7 @@ def parse_args(program_description):
      help = "Use command line as input",
     )
     p_command.add_argument('-merra2', action='store_true', default= False, help='use merra2 restarts')
+    p_command.add_argument('-geosit', action='store_true', default= False, help='use GEOSIT restarts')
 
     p_command.add_argument('-ymdh',              help='yyyymmddhh year month date hour of input and new restarts')
     p_command.add_argument('-grout',             help='Grid ID/resolution of new restarts, format C[xxx] (cubed-sphere only for now)')
@@ -91,20 +92,25 @@ def get_answers_from_command_line(cml):
 
    answers = {}
    answers["input:shared:MERRA-2"]     = cml.merra2
+   answers["input:shared:GEOS-IT"]     = cml.geosit
    answers["input:shared:yyyymmddhh"]  = cml.ymdh
-   answers["input:shared:omodel"]      = cml.ocnmdlin
    answers["output:shared:out_dir"]    = os.path.abspath(cml.out_dir + '/')
    if  cml.merra2:
       init_merra2(answers)
+   elif  cml.geosit:
+      init_geosit(answers)
    else:   
-      answers["input:shared:bc_version"]   = cml.bcvin
-      answers["input:surface:catch_model"] = cml.catch_model
-      answers["input:shared:rst_dir"]      = os.path.abspath(cml.rst_dir + '/')
+      answers["input:shared:bc_base"]     =  cml.in_bc_base
+      answers["input:shared:omodel"]      = cml.ocnmdlin
+      answers["input:shared:bc_version"]  = cml.bcvin
+      answers["input:surface:catch_model"]= cml.catch_model
+      answers["input:shared:stretch"]     = cml.in_stretch
+      answers["input:shared:rst_dir"]     = os.path.abspath(cml.rst_dir + '/')
       fvcore_info(answers) 
-      ogrid                            = cml.oceanin
+      ogrid                               = cml.oceanin
       if ogrid == "CS":
          ogrid = answers["input:shared:agrid"]
-      answers["input:shared:ogrid"]    = ogrid
+      answers["input:shared:ogrid"]       = ogrid
 
    answers["output:shared:agrid"]      = cml.grout
    answers["output:air:nlevel"]        = cml.levsout
@@ -117,11 +123,9 @@ def get_answers_from_command_line(cml):
       ogrid = answers["output:shared:agrid"]
    answers["output:shared:ogrid"]      = ogrid
 
-   answers["input:shared:bc_base"]  =  cml.in_bc_base
    answers["output:shared:bc_base"] =  cml.out_bc_base
 
    answers["output:shared:stretch"]    = cml.out_stretch
-   answers["input:shared:stretch"]     = cml.in_stretch
    answers["output:analysis:bkg"]      = not cml.nobkg
    answers["output:analysis:lcv"]      = not cml.nolcv
    if cml.rs == '1':
diff --git a/pre/remap_restart/remap_lake_landice_saltwater.py b/pre/remap_restart/remap_lake_landice_saltwater.py
index ca2f9cd..253fc3a 100755
--- a/pre/remap_restart/remap_lake_landice_saltwater.py
+++ b/pre/remap_restart/remap_lake_landice_saltwater.py
@@ -12,6 +12,7 @@
 import os
 import subprocess as sp
 import shutil
+import subprocess
 import glob
 import ruamel.yaml
 import shlex
@@ -23,7 +24,10 @@
 class lake_landice_saltwater(remap_base):
   def __init__(self, **configs):
      super().__init__(**configs)
-     self.copy_merra2()
+     if self.config['input']['shared']['MERRA-2']:
+        self.copy_merra2()
+     if self.config['input']['shared']['GEOS-IT']:
+        self.copy_geosit()
 
   def remap(self):
      if not self.config['output']['surface']['remap_water']:
@@ -170,7 +174,8 @@ def remap(self):
      print('cd ' + cwdir)
      os.chdir(cwdir)
 
-     self.remove_merra2()
+     if self.config['input']['shared']['MERRA-2']:
+        self.remove_merra2()
 
   def run_and_log(self, cmd, log_name):
      print('\n'+cmd)
@@ -247,3 +252,4 @@ def copy_merra2(self):
 if __name__ == '__main__' :
    lls = lake_landice_saltwater(params_file='remap_params.yaml')
    lls.remap()
+   lls.remove_geosit()
diff --git a/pre/remap_restart/remap_params.tpl b/pre/remap_restart/remap_params.tpl
index 1e7f655..7ac89ee 100644
--- a/pre/remap_restart/remap_params.tpl
+++ b/pre/remap_restart/remap_params.tpl
@@ -10,6 +10,7 @@ input:
     hydrostatic: 0
   shared:
     MERRA-2: false
+    GEOS-IT: false
     stretch: false
     # (coupled) ocean model: data, MOM5, MOM6
     omodel: data
@@ -44,6 +45,7 @@ output:
     # remap upper air or not
     remap: true
     nlevel:
+    agcm_import_rst: false
   surface:
     split_saltwater: false
     surflay: 50.
diff --git a/pre/remap_restart/remap_questions.py b/pre/remap_restart/remap_questions.py
index af624c0..84db949 100755
--- a/pre/remap_restart/remap_questions.py
+++ b/pre/remap_restart/remap_questions.py
@@ -50,12 +50,30 @@ def validate_merra2_time(text):
          return False 
    else:
      return False
+
+def validate_geosit_time(text):
+   if len(text) == 10 :
+      dd = text[6:8]
+      hh = text[8:]
+      if dd in ['14','28'] and hh in ['21']:
+         return True
+      else:
+         return False
+   else:
+     return False
+
 def SITE_MERRA2(x):
   if GEOS_SITE == "NAS":
      x['input:shared:MERRA-2']= False
      return False
   return True
 
+def SITE_GEOSIT(x):
+  if GEOS_SITE == "NAS":
+     x['input:shared:GEOS-IT']= False
+     return False
+  return True 
+
 def ask_questions():
 
    # See remap_utils.py for definitions of "choices", "message" strings, and "validate" lists
@@ -69,32 +87,48 @@ def ask_questions():
             "default": False,
             "when": lambda x: SITE_MERRA2(x),
         },
+        {
+            "type": "confirm",
+            "name": "input:shared:GEOS-IT",
+            "message": "Remap archived GEOS-IT restarts? (NCCS/Discover only; elsewhere, select 'N' and complete full config; requires nc4 restarts.)\n",
+            "default": False,
+            "when": lambda x: SITE_GEOSIT(x) and not x.get("input:shared:MERRA-2", False),
+        },
         {
             "type": "path",
             "name": "input:shared:rst_dir",
             "message": "Enter input directory with restart files to be remapped:\n",
-            "when": lambda x: not x['input:shared:MERRA-2'],
+            "when": lambda x: not x.get("input:shared:MERRA-2", False) and not x.get("input:shared:GEOS-IT", False),
+        },
+        {
+            "type": "text",
+            "name": "input:shared:yyyymmddhh",
+            "message": "Enter the restart date and hour (YYYYMMDDHH):\n",
+            "validate": lambda text: len(text) == 10,
+            "when": lambda x: not x.get('input:shared:MERRA-2', False) and not x.get('input:shared:GEOS-IT', False) and not fvcore_info(x),
         },
         {
             "type": "text",
             "name": "input:shared:yyyymmddhh",
-            "message": (message_datetime + ".)\n"),
-            "validate": lambda text: len(text)==10 ,
-            "when": lambda x: not x['input:shared:MERRA-2'] and not fvcore_info(x),
+            "message": "Enter the restart date and hour (YYYYMMDDHH, hour = 03, 09, 15, or 21 [z]):\n",
+            "validate": lambda text: validate_merra2_time(text),
+            "when": lambda x: x.get("input:shared:MERRA-2", False),
         },
         {
             "type": "text",
             "name": "input:shared:yyyymmddhh",
-            "message": (message_datetime + "; hour = 03, 09, 15, or 21 [z].)\n"),
-            "validate": lambda text: validate_merra2_time(text) ,
-            "when": lambda x: x['input:shared:MERRA-2'],
+            "message": "Enter the restart date and hour (YYYYMMDDHH, Only days available are 14th and 28th and only hour = 21 [z]):\n",
+            "validate": lambda text: validate_geosit_time(text),
+            "when": lambda x: x.get("input:shared:GEOS-IT", False) and not x.get("input:shared:MERRA-2", False),
         },
+
         {
             "type": "path",
             "name": "output:shared:out_dir",
             "message": message_out_dir,
         },
 
+
         # dummy (invisible) question to run function that initializes MERRA-2 config
         {
             "type": "path",
@@ -103,33 +137,41 @@ def ask_questions():
             # always return false, so question never shows but changes x
             "when": lambda x: init_merra2(x),
         },
-
+        # dummy (invisible) question to run function that initializes GEOS-IT config
         {
-            "type": "text",
-            "name": "input:shared:agrid",
-            "message": message_agrid_in,
-            "validate": lambda text : text in validate_agrid,
-            # if it is merra-2 or has_fvcore, agrid is deduced
-            "when": lambda x: not x['input:shared:MERRA-2'] and not fvcore_info(x),
+            "type": "path",
+            "name": "output:shared:out_dir",
+            "message": "init GEOSIT\n",
+            # always return false, so question never shows but changes x
+            "when": lambda x: init_geosit(x),
         },
 
+        # for both MERRA2 and GEOS-IT
         {
-            "type": "select",
-            "name": "input:shared:omodel",
-            "message": "Select ocean model of input restarts:\n",
-            "choices": choices_omodel,
-            "default": "data",
-            "when": lambda x: not x['input:shared:MERRA-2']
+           "type": "text",
+           "name": "input:shared:agrid",
+           "message": message_agrid_in,
+           "validate": lambda text: text in validate_agrid,
+           "when": lambda x: not x['input:shared:MERRA-2'] and not x['input:shared:GEOS-IT'] and not fvcore_info(x),
         },
 
-        {
-            "type": "select",
-            "name": "input:shared:ogrid",
-            "message": message_ogrid_in,
-            "choices": choices_ogrid_data,
-            "default": lambda x: data_ocean_default(x.get('input:shared:agrid')),
-            "when": lambda x: x.get('input:shared:omodel') == 'data' and not x['input:shared:MERRA-2'],
-        },
+        {        
+           "type": "select",
+           "name": "input:shared:omodel",
+           "message": "Select ocean model of input restarts:\n",
+           "choices": choices_omodel,
+           "default": "data",
+           "when": lambda x: not x['input:shared:MERRA-2'] and not x['input:shared:GEOS-IT'],
+       },
+
+       {   
+          "type": "select",
+          "name": "input:shared:ogrid",
+          "message": message_ogrid_in,
+          "choices": choices_ogrid_data,
+          "default": lambda x: data_ocean_default(x.get('input:shared:agrid')),
+          "when": lambda x: x.get('input:shared:omodel') == 'data' and not x['input:shared:MERRA-2'] and not x['input:shared:GEOS-IT'],
+       },
 
         # dummy (invisible) question to remove parenthetical comments from selected input:shared:ogrid
         {
@@ -232,7 +274,7 @@ def ask_questions():
             "name": "input:shared:bc_version",
             "message": message_bc_ops_in,
             "choices": choices_bc_ops,
-            "when": lambda x: not x["input:shared:MERRA-2"],
+            "when": lambda x: not x["input:shared:MERRA-2"] and not x["input:shared:GEOS-IT"],
         },
 
         {
@@ -249,7 +291,7 @@ def ask_questions():
             "message": message_bc_ops_new,
             "choices": choices_bc_ops,
             "default": "NL3",
-            "when": lambda x: x["input:shared:MERRA-2"],
+            "when": lambda x: x["input:shared:MERRA-2"] or x["input:shared:GEOS-IT"],
         },
 
         {
@@ -258,7 +300,7 @@ def ask_questions():
             "message": "Select BCs version for new restarts:\n",
             "choices": choices_bc_ops,
             "default": "NL3",
-            "when": lambda x: not x["input:shared:MERRA-2"],
+            "when": lambda x: not x["input:shared:MERRA-2"] and not x["input:shared:GEOS-IT"],
         },
 
         {
@@ -355,7 +397,6 @@ def ask_questions():
             "message": "Remap bkg files?  (Required by ADAS but not mapped onto ADAS grid; run one ADAS cycle to spin up.) ",
             "default": False,
         },
-
         {
             "type": "confirm",
             "name": "output:analysis:lcv",
@@ -419,11 +460,12 @@ def ask_questions():
    answers['output:shared:out_dir'] = os.path.abspath(answers['output:shared:out_dir'])
 
    if answers.get('input:air:nlevel') : del answers['input:air:nlevel']
-   if answers["output:surface:remap"] and not answers["input:shared:MERRA-2"]:  
+   if answers["output:surface:remap"] and not answers["input:shared:MERRA-2"] and not answers["input:shared:GEOS-IT"]:  
       answers["input:surface:catch_model"] = catch_model(answers)
    answers["output:surface:remap_water"] = answers["output:surface:remap"]
    answers["output:surface:remap_catch"] = answers["output:surface:remap"]
    del answers["output:surface:remap"]
+
  
    return answers
 
diff --git a/pre/remap_restart/remap_restarts.py b/pre/remap_restart/remap_restarts.py
index f2a380f..a5ade81 100755
--- a/pre/remap_restart/remap_restarts.py
+++ b/pre/remap_restart/remap_restarts.py
@@ -133,6 +133,8 @@ def main():
   ana = analysis(params_file=config_yaml)
   ana.remap()
 
+  ana.remove_geosit()
+
 if __name__ == '__main__' :
   main()
   
diff --git a/pre/remap_restart/remap_upper.py b/pre/remap_restart/remap_upper.py
index 6704d8d..4155dc3 100755
--- a/pre/remap_restart/remap_upper.py
+++ b/pre/remap_restart/remap_upper.py
@@ -22,7 +22,10 @@
 class upperair(remap_base):
   def __init__(self, **configs):
      super().__init__(**configs)
-     self.copy_merra2()
+     if self.config['input']['shared']['MERRA-2']:
+        self.copy_merra2()
+     if self.config['input']['shared']['GEOS-IT']:
+        self.copy_geosit()
 
   def remap(self):
      if not self.config['output']['air']['remap'] :
@@ -49,6 +52,10 @@ def remap(self):
                     "ni_internal_rst"          ,
                     "su_internal_rst"          ,
                     "tr_internal_rst"]
+
+     cp_agcm_import_rst = self.config['output']['air'].get('agcm_import_rst', False)
+     if ( not cp_agcm_import_rst) :
+       self.air_restarts.remove("agcm_import_rst")
      restarts_in = self.find_rst()
      if len(restarts_in) == 0:
        return
@@ -332,7 +339,8 @@ def remap(self):
      print('cd ' + cwdir)
      os.chdir(cwdir)
 
-     self.remove_merra2()
+     if self.config['input']['shared']['MERRA-2']:
+        self.remove_merra2()
 
   def find_rst(self):
      rst_dir = self.config['input']['shared']['rst_dir']
@@ -394,3 +402,4 @@ def copy_merra2(self):
 if __name__ == '__main__' :
    air = upperair(params_file='remap_params.yaml')
    air.remap()
+   air.remove_geosit()
diff --git a/pre/remap_restart/remap_utils.py b/pre/remap_restart/remap_utils.py
index ccb10a9..4815f21 100755
--- a/pre/remap_restart/remap_utils.py
+++ b/pre/remap_restart/remap_utils.py
@@ -117,6 +117,8 @@
 
 message_ogrid_in   = "Select data ocean grid/resolution of input restarts:\n"
 
+message_ogrid_new   = "Select data ocean grid/resolution of output restarts:\n"
+
 message_qos        = "SLURM or PBS quality-of-service (qos)?  (If resolution is c1440 or higher, enter 'allnccs' for NCCS or 'normal' for NAS.)\n"
 
 message_account    = "Select/enter SLURM or PBS account:\n"
@@ -181,6 +183,37 @@ def init_merra2(x):
 
   return False
 
+def init_geosit(x):
+  if not x.get('input:shared:GEOS-IT') : return False
+
+  yyyymm = int(x.get('input:shared:yyyymmddhh')[0:6])
+
+  if yyyymm < 199701:
+      exit("Error. GEOS-IT data < 1997 not available\n")
+  elif 199612 <= yyyymm <= 200712:
+      expid = "d5294_geosit_jan98"
+  elif 200801 <= yyyymm < 201801:
+      expid = "d5294_geosit_jan08"
+  elif yyyymm >= 201801:
+      expid = "d5294_geosit_jan18"  # For any date starting from 201801 and beyond
+  else:
+      exit("Error. GEOS-IT data not available for this date\n")
+
+  x['input:shared:expid']        = expid
+  x['input:shared:omodel']       = 'data'
+  x['input:shared:agrid']        = 'C180'
+  x['input:shared:ogrid']        = 'CS'
+  x['input:shared:omodel']       = 'data'
+  x['input:shared:bc_version']   = 'NL3'
+  x['input:shared:bc_base']     = '/discover/nobackup/projects/gmao/bcs_shared/fvInput/ExtData/esm/tiles'
+  x['input:surface:catch_model'] = 'catch'
+  x['input:shared:stretch']      = False
+  x['input:shared:rst_dir']      = x['output:shared:out_dir'] + '/geosit_tmp_'+x['input:shared:yyyymmddhh']+'/'
+  x['input:air:nlevel']          = 72
+
+  return False
+
+
 def fvcore_info(x):
   if 'input:shared:agrid' in x.keys():
      return True
@@ -303,11 +336,15 @@ def wemin_default(bc_version):
    return default_
 
 def show_wemin_default(x):
-   if not x['input:shared:MERRA-2']:
-      return True
+   if x['input:shared:MERRA-2']:
+       x['input:surface:wemin'] = '26'
+       return False
+   elif x['input:shared:GEOS-IT']:
+       x['input:surface:wemin'] = '13'
+       return False
    else:
-      x['input:surface:wemin'] = '26'
-      return False
+       # If neither MERRA2 or GEOS-IT is selected option will be shown on screen
+       return True
 
 def zoom_default(x):
    zoom_ = '8'
@@ -318,7 +355,7 @@ def zoom_default(x):
       zoom_ = str(int(zoom))
       if zoom < 1 : zoom_ = '1'
       if zoom > 8 : zoom_ = '8'
-   if x['input:shared:MERRA-2'] :
+   if x.get('input:shared:MERRA-2') or x.get('input:shared:GEOS-IT'):
       zoom_ = '2'
    return zoom_
 
@@ -376,7 +413,8 @@ def print_config( config, indent = 0 ):
 
 def get_command_line_from_answers(answers):
 
-   merra2  = " -merra2 " if answers["input:shared:MERRA-2"] else ""
+   merra2  = " -merra2 " if answers.get("input:shared:MERRA-2", False) else ""
+   geosit  = " -geosit " if answers.get("input:shared:GEOS-IT", False) else ""
    ymdh    = " -ymdh    " + answers["input:shared:yyyymmddhh"]
    rst_dir = " -rst_dir " + answers["input:shared:rst_dir"]
 
@@ -454,6 +492,7 @@ def get_command_line_from_answers(answers):
       partition  = " -partition  " + answers["slurm_pbs:partition"]
 
    cmdl = "remap_restarts.py command_line " + merra2 + \
+                                          geosit + \
                                           ymdh  + \
                                           grout + \
                                           levsout  + \
diff --git a/pre/remap_restart/tests/amip_c180Toc90.yaml b/pre/remap_restart/tests/amip_c180Toc90.yaml
index fbd5564..36278f3 100644
--- a/pre/remap_restart/tests/amip_c180Toc90.yaml
+++ b/pre/remap_restart/tests/amip_c180Toc90.yaml
@@ -9,6 +9,7 @@ input:
     hydrostatic: 0
   shared:
     MERRA-2: false
+    GEOS-IT: false
     stretch: false
     agrid: C180
     # (coupled) ocean model: data, MOM5, MOM6
@@ -41,6 +42,7 @@ output:
     # remap upper air or not
     remap: true
     nlevel: '72'
+    agcm_import_rst: false
   surface:
     split_saltwater: true
     surflay: 50.0
diff --git a/pre/remap_restart/tests/c180Toc360.yaml b/pre/remap_restart/tests/c180Toc360.yaml
index e9e1c09..7c3ee8b 100644
--- a/pre/remap_restart/tests/c180Toc360.yaml
+++ b/pre/remap_restart/tests/c180Toc360.yaml
@@ -9,6 +9,7 @@ input:
     hydrostatic: 0
   shared:
     MERRA-2: false
+    GEOS-IT: false
     stretch: false
     # (coupled) ocean model: data, MOM5, MOM6
     omodel: data
@@ -41,6 +42,7 @@ output:
     # remap upper air or not
     remap: true
     nlevel: '91'
+    agcm_import_rst: false
   surface:
     split_saltwater: true
     surflay: 50.0
diff --git a/pre/remap_restart/tests/c24Toc12.yaml b/pre/remap_restart/tests/c24Toc12.yaml
index fb7d67d..6ce7a3e 100644
--- a/pre/remap_restart/tests/c24Toc12.yaml
+++ b/pre/remap_restart/tests/c24Toc12.yaml
@@ -9,6 +9,7 @@ input:
     hydrostatic: 0
   shared:
     MERRA-2: false
+    GEOS-IT: false
     stretch: false
     # (coupled) ocean model: data, MOM5, MOM6
     omodel: data
@@ -41,6 +42,7 @@ output:
     # remap upper air or not
     remap: true
     nlevel: '72'
+    agcm_import_rst: true
   surface:
     split_saltwater: true
     surflay: 50.0
diff --git a/pre/remap_restart/tests/c360Toc24.yaml b/pre/remap_restart/tests/c360Toc24.yaml
index de7a55a..7e6eee2 100644
--- a/pre/remap_restart/tests/c360Toc24.yaml
+++ b/pre/remap_restart/tests/c360Toc24.yaml
@@ -9,6 +9,7 @@ input:
     hydrostatic: 0
   shared:
     MERRA-2: false
+    GEOS-IT: false
     agrid: C360
     stretch: false
     # (coupled) ocean model: data, MOM5, MOM6
@@ -41,6 +42,7 @@ output:
     # remap upper air or not
     remap: true
     nlevel: '181'
+    agcm_import_rst: false
   surface:
     split_saltwater: true
     surflay: 50.0
diff --git a/pre/remap_restart/tests/f522Toc360.yaml b/pre/remap_restart/tests/f522Toc360.yaml
index 2d2975f..6f13320 100644
--- a/pre/remap_restart/tests/f522Toc360.yaml
+++ b/pre/remap_restart/tests/f522Toc360.yaml
@@ -9,6 +9,7 @@ input:
     hydrostatic: 0
   shared:
     MERRA-2: false
+    GEOS-IT: false
     stretch: false
     # (coupled) ocean model: data, MOM5, MOM6
     omodel: data
@@ -38,6 +39,7 @@ output:
     label: False
   air:
     nlevel: '72'
+    agcm_import_rst: false
     remap: true
   surface:
     split_saltwater: true