Index: /branches/eam_branches/ipp-20140904/Ohana/src/relastro/src/FrameCorrection.c
===================================================================
--- /branches/eam_branches/ipp-20140904/Ohana/src/relastro/src/FrameCorrection.c	(revision 37693)
+++ /branches/eam_branches/ipp-20140904/Ohana/src/relastro/src/FrameCorrection.c	(revision 37694)
@@ -21,14 +21,19 @@
   int i;
   for (i = 0; i < NLOOP; i++) {
-    ICRFobj *icrfobj = slurp_icrf_obj (regionHosts, i);
-    FrameCorrectionSet *set = FrameCorrectionMeasure (icrfobj);
-
-    char *filename = make_filename (CATDIR, "master", 0, "frame.corr.fits");
-    FrameCorrectionSetSave (filename, set);
-    free (filename);
-
-    char *syncfile = make_filename (CATDIR, "master", 0, "frame.corr.sync");
-    update_sync_file (syncfile, i);
-    free (syncfile);
+    if ((i > 1) || !USE_GALAXY_MODEL) {
+      // if GALAXY_MODEL is selected, we want to delay the frame correction until we have 
+      // applied the galaxy model a couple of times.
+
+      ICRFobj *icrfobj = slurp_icrf_obj (regionHosts, i);
+      FrameCorrectionSet *set = FrameCorrectionMeasure (icrfobj);
+      
+      char *filename = make_filename (CATDIR, "master", 0, "frame.corr.fits");
+      FrameCorrectionSetSave (filename, set);
+      free (filename);
+      
+      char *syncfile = make_filename (CATDIR, "master", 0, "frame.corr.sync");
+      update_sync_file (syncfile, i);
+      free (syncfile);
+    }
   }
 
Index: /branches/eam_branches/ipp-20140904/Ohana/src/relastro/src/relastro_parallel_images.c
===================================================================
--- /branches/eam_branches/ipp-20140904/Ohana/src/relastro/src/relastro_parallel_images.c	(revision 37693)
+++ /branches/eam_branches/ipp-20140904/Ohana/src/relastro/src/relastro_parallel_images.c	(revision 37694)
@@ -104,5 +104,9 @@
       for (i = 0; i < NLOOP; i++) {
 	UpdateObjects (catalog, Ncatalog, (i > 0));
-	FrameCorrectionParallelSlave (catalog, Ncatalog, regionHosts, i); 
+	if ((i > 1) || !USE_GALAXY_MODEL) {
+	  // if GALAXY_MODEL is selected, we want to delay the frame correction until we have 
+	  // applied the galaxy model a couple of times.
+	  FrameCorrectionParallelSlave (catalog, Ncatalog, regionHosts, i); 
+	}
 	share_mean_pos (catalog, Ncatalog, regionHosts, i);
 	slurp_mean_pos (catalog, Ncatalog, regionHosts, i);