diff --git a/src/grid/grid3D.h b/src/grid/grid3D.h
index 1cdaaab39..a3d1bb0cf 100644
--- a/src/grid/grid3D.h
+++ b/src/grid/grid3D.h
@@ -12,7 +12,7 @@
 
 #include <functional>
 
-#include "../global/global.h"
+#include "../global/global.h"  // declares Parameter and forward-declares ParameterMap
 #include "../global/global_cuda.h"
 #include "../io/FnameTemplate.h"
 
@@ -437,10 +437,10 @@ class Grid3D
    *  \brief Allocate memory for the d, m, E arrays. */
   void AllocateMemory(void);
 
-  /*! \fn void Set_Initial_Conditions(Parameters P )
-   *  \brief Set the initial conditions based on info in the parameters
-   * structure. */
-  void Set_Initial_Conditions(Parameters P);
+  /*! Set the initial conditions based on already-parsed parameter info in the
+   *  \ref Parameters arg or unparsed parameter-info in the \ref ParameterMap arg
+   */
+  void Set_Initial_Conditions(Parameters P, const ParameterMap &pmap);
 
   /*! \fn void Get_Position(long i, long j, long k, Real *xpos, Real *ypos, Real
    * *zpos) \brief Get the cell-centered position based on cell index */
diff --git a/src/grid/initial_conditions.cpp b/src/grid/initial_conditions.cpp
index 0fdea357d..0c830dfec 100644
--- a/src/grid/initial_conditions.cpp
+++ b/src/grid/initial_conditions.cpp
@@ -23,10 +23,8 @@
 #include "../utils/math_utilities.h"
 #include "../utils/mhd_utilities.h"
 
-/*! \fn void Set_Initial_Conditions(Parameters P )
- *  \brief Set the initial conditions based on info in the parameters structure.
- */
-void Grid3D::Set_Initial_Conditions(Parameters P)
+/*! Set the initial conditions based on info in the parameters structure. */
+void Grid3D::Set_Initial_Conditions(Parameters P, const ParameterMap &pmap)
 {
   Set_Domain_Properties(P);
   Set_Gammas(P.gamma);
diff --git a/src/main.cpp b/src/main.cpp
index edb0472a1..8433fc27d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -128,7 +128,7 @@ int main(int argc, char *argv[])
 
   // Set initial conditions
   chprintf("Setting initial conditions...\n");
-  G.Set_Initial_Conditions(P);
+  G.Set_Initial_Conditions(P, pmap);
   chprintf("Initial conditions set.\n");
   // set main variables for Read_Grid and Read_Grid_Cat initial conditions
   if (is_restart) {