diff --git a/src/addon/SensitivityOptimizer.cxx b/src/addon/SensitivityOptimizer.cxx
index af8f4607..9b9af0c0 100644
--- a/src/addon/SensitivityOptimizer.cxx
+++ b/src/addon/SensitivityOptimizer.cxx
@@ -1530,7 +1530,7 @@ bool SensitivityOptimizer::ParseCommandLine(int argc, char** argv)
   m_MimrecSettings.Read(ConfigurationFile);
   m_EventSelector.SetSettings(&m_MimrecSettings);
   m_EventSelector.SetGeometry(&m_Geometry);
-  
+  cout<<"Coordinate system : "<<m_MimrecSettings.GetSourceCoordinates()<<endl;
   return true;
 }
 
@@ -1832,10 +1832,32 @@ bool SensitivityOptimizer::Analyze()
                                     double xx = m_PosTheta[x]; 
                                     double xy = m_PosPhi[y];
                                     double xz = 1000000000.0;
-                                    MMath::SphericToCartesean(xx, xy, xz);
-                                    MVector Position(xx, xy, xz);
                                     
-                                    S.SetSourceWindow(true, Position, MCoordinateSystem::c_Cartesian3D);
+				    
+				    MVector Position(0.0, 0.0, 1.0); 
+
+                                    // Put the correct Position and coord system for the source
+                                     if (m_MimrecSettings.GetCoordinateSystem() == MCoordinateSystem::c_Spheric) {
+                                             Position.SetMagThetaPhi(xz, xx*c_Rad, xy*c_Rad);
+                                        } else if (m_MimrecSettings.GetCoordinateSystem() == MCoordinateSystem::c_Galactic) {
+                                             Position.SetMagThetaPhi(xz, (xx+90)*c_Rad, xy*c_Rad);
+                                        } else if (m_MimrecSettings.GetCoordinateSystem() == MCoordinateSystem::c_Cartesian2D ||
+                                                   m_MimrecSettings.GetCoordinateSystem() == MCoordinateSystem::c_Cartesian3D) {
+                                             MMath::SphericToCartesean(xx, xy, xz);
+                                             MVector Position(xx, xy, xz);
+                                        } else {
+                                             merr<<"Unknown coordinate system ID: "<<m_MimrecSettings.GetCoordinateSystem()<<fatal;
+                                        }
+
+				    
+				    
+				     S.SetSourceWindow(true, Position, m_MimrecSettings.GetSourceCoordinates());
+				    //MMath::SphericToCartesean(xx, xy, xz);
+                                    //MVector Position(xx, xy, xz);
+				    
+				    
+                                    //S.SetSourceWindow(true, Position, MCoordinateSystem::c_Cartesian3D);
+                                   
 
                                     double ARMMin = m_MimrecSettings.GetSourceARMMin();
                                     double ARMMax = m_MimrecSettings.GetSourceARMMax();
@@ -1946,10 +1968,30 @@ bool SensitivityOptimizer::Analyze()
                             double xx = m_PosTheta[x]; 
                             double xy = m_PosPhi[y];
                             double xz = 1000000000.0;
-                            MMath::SphericToCartesean(xx, xy, xz);
-                            MVector Position(xx, xy, xz);
                             
-                            S.SetSourceWindow(true, Position, MCoordinateSystem::c_Cartesian3D);
+			    MVector Position(0.0, 0.0, 1.0); 
+
+                                    // Put the correct Position and coord system for the source
+                                     if (m_MimrecSettings.GetCoordinateSystem() == MCoordinateSystem::c_Spheric) {
+                                             Position.SetMagThetaPhi(xz, xx*c_Rad, xy*c_Rad);
+                                        } else if (m_MimrecSettings.GetCoordinateSystem() == MCoordinateSystem::c_Galactic) {
+                                             Position.SetMagThetaPhi(xz, (xx+90)*c_Rad, xy*c_Rad);
+                                        } else if (m_MimrecSettings.GetCoordinateSystem() == MCoordinateSystem::c_Cartesian2D ||
+                                                   m_MimrecSettings.GetCoordinateSystem() == MCoordinateSystem::c_Cartesian3D) {
+                                             MMath::SphericToCartesean(xx, xy, xz);
+                                             MVector Position(xx, xy, xz);
+                                        } else {
+                                             merr<<"Unknown coordinate system ID: "<<m_MimrecSettings.GetCoordinateSystem()<<fatal;
+                                        }
+
+				    
+				    
+		            S.SetSourceWindow(true, Position, m_MimrecSettings.GetSourceCoordinates());
+			    
+			    //MMath::SphericToCartesean(xx, xy, xz);
+                            //MVector Position(xx, xy, xz);
+                            
+                            //S.SetSourceWindow(true, Position, MCoordinateSystem::c_Cartesian3D);
                             
                             double ARMMin = m_MimrecSettings.GetSourceARMMin();
                             double ARMMax = m_MimrecSettings.GetSourceARMMax();
@@ -2045,10 +2087,31 @@ bool SensitivityOptimizer::Analyze()
                             double xx = m_PosTheta[x]; 
                             double xy = m_PosPhi[y];
                             double xz = 1000000000.0;
-                            MMath::SphericToCartesean(xx, xy, xz);
-                            MVector Position(xx, xy, xz);
                             
-                            S.SetSourceWindow(true, Position, MCoordinateSystem::c_Cartesian3D);
+			    
+			   MVector Position(0.0, 0.0, 1.0); 
+
+                                    // Put the correct Position and coord system for the source
+                                     if (m_MimrecSettings.GetCoordinateSystem() == MCoordinateSystem::c_Spheric) {
+                                             Position.SetMagThetaPhi(xz, xx*c_Rad, xy*c_Rad);
+                                        } else if (m_MimrecSettings.GetCoordinateSystem() == MCoordinateSystem::c_Galactic) {
+                                             Position.SetMagThetaPhi(xz, (xx+90)*c_Rad, xy*c_Rad);
+                                        } else if (m_MimrecSettings.GetCoordinateSystem() == MCoordinateSystem::c_Cartesian2D ||
+                                                   m_MimrecSettings.GetCoordinateSystem() == MCoordinateSystem::c_Cartesian3D) {
+                                             MMath::SphericToCartesean(xx, xy, xz);
+                                             MVector Position(xx, xy, xz);
+                                        } else {
+                                             merr<<"Unknown coordinate system ID: "<<m_MimrecSettings.GetCoordinateSystem()<<fatal;
+                                        }
+
+				    
+				    
+		            S.SetSourceWindow(true, Position, m_MimrecSettings.GetSourceCoordinates());
+			    
+			    //MMath::SphericToCartesean(xx, xy, xz);
+                            //MVector Position(xx, xy, xz);
+                            
+                            //S.SetSourceWindow(true, Position, MCoordinateSystem::c_Cartesian3D);
                             S.SetSourceARM(0, m_ARMorRadius[a]);
                             S.SetBeamRadius(m_BRA[b]);
                             S.SetBeamDepth(m_BDE[c]);
diff --git a/src/response/src/MResponseImagingBinnedMode.cxx b/src/response/src/MResponseImagingBinnedMode.cxx
index 43abee25..5d9bbc5f 100644
--- a/src/response/src/MResponseImagingBinnedMode.cxx
+++ b/src/response/src/MResponseImagingBinnedMode.cxx
@@ -119,8 +119,8 @@ MString MResponseImagingBinnedMode::Options()
   out<<"             dmin:                    minimum distance (default: 0 cm)"<<endl;
   out<<"             dmax:                    maximum distance (default: 1,000 cm)"<<endl;
   out<<"             dbins:                   number of distance bins between min and max distance (default: 1)"<<endl;
-  out<<"             atabsfile:               the atmospheric absorption file name (default: \"\" (i.e. none))"<<endl;
-  out<<"             atabsheight:             altitude for the atmospheric absorption (default: 33500 m)"<<endl;
+  out<<"             atabsfilename:               the atmospheric absorption file name (default: \"\" (i.e. none))"<<endl;
+  out<<"             atabsaltitude:             altitude for the atmospheric absorption (default: 33500 m)"<<endl;
   
   return MString(out);
 }
diff --git a/src/response/src/MResponsePolarizationBinnedMode.cxx b/src/response/src/MResponsePolarizationBinnedMode.cxx
index 9a525920..7eebec11 100644
--- a/src/response/src/MResponsePolarizationBinnedMode.cxx
+++ b/src/response/src/MResponsePolarizationBinnedMode.cxx
@@ -124,8 +124,8 @@ MString MResponsePolarizationBinnedMode::Options()
   out<<"             dbins:                   number of distance bins between min and max distance (default: 1)"<<endl;
   out<<"             pbins:                   number of polarization bins bins between min and max distance (default: 18)"<<endl;
   out<<"             pmode:                   Either relativex, relativey, or relativez (default: relativez)"<<endl;
-  out<<"             atabsfile:               the atmopheric absorption file name (default: \"\" (i.e. none))"<<endl;
-  out<<"             atabsheight:             altitude for the atmospheric absorption (default: 33500)"<<endl;
+  out<<"             atabsfilename:               the atmopheric absorption file name (default: \"\" (i.e. none))"<<endl;
+  out<<"             atabsaltitude:             altitude for the atmospheric absorption (default: 33500)"<<endl;
   
   return MString(out);
 }