diff --git a/LSL2/STPROC/ENVIRONMENT_SERVICES.txt b/LSL2/STPROC/ENVIRONMENT_SERVICES.txt
index 5ce5f34..409deac 100644
--- a/LSL2/STPROC/ENVIRONMENT_SERVICES.txt
+++ b/LSL2/STPROC/ENVIRONMENT_SERVICES.txt
@@ -601,6 +601,7 @@ Service GetScrapeServerPort()
     
 end service
 
+
 Service GetTextDataBackupRootDir()
     
     Machine = Environment_Services('GetServer')
@@ -621,8 +622,42 @@ Service GetTextDataBackupRootDir()
     
 end service
 
+
+Service GetSapFtpServerIP()
+	
+	If Environment_Services('IsProd') then
+		Response = '172.23.28.185'
+	end else
+		Response = '172.28.127.107'
+	end
+	
+end service
+
+
+Service GetSapFtpServerUser()
+	
+	If Environment_Services('IsProd') then
+		Response = 'prdopeni'
+	end else
+		Response = 'qasopeni'
+	end	
+	
+end service
+
+
+Service GetSapFtpServerPassword()
+	
+	If Environment_Services('IsProd') then
+		Response = 'sapprdopeni'
+	end else
+		Response = 'sapqasopeni'
+	end	
+	
+end service
+
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Internal GoSubs
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
+
diff --git a/LSL2/STPROC/OBJ_SAP.txt b/LSL2/STPROC/OBJ_SAP.txt
index 5e38579..6b9dfd8 100644
--- a/LSL2/STPROC/OBJ_SAP.txt
+++ b/LSL2/STPROC/OBJ_SAP.txt
@@ -76,32 +76,30 @@ end
 
 Main:
 
-    RepoID     = ''
-    SAPEnviron = Environment_Services('GetSAPPath')
+    RepoID         = ''
+    SAPEnviron     = Environment_Services('GetSAPPath')
+	FTPServerIP    = Environment_Services('GetSapFtpServerIP')
+	FTPUser        = Environment_Services('GetSapFtpServerUser')
+	FTPPassWord    = Environment_Services('GetSapFtpServerPassword')
+	FTPCapturePath = Environment_Services('GetApplicationRootPath') : '\SAP\FTPFiles\'
 
-    BEGIN CASE
-        CASE SAPEnviron = 'PRD'
-            TransFilePathIn		= Environment_Services('GetFTPRootPath') : '\FTP_IN'
-            TransFilePathOut	= Environment_Services('GetFTPRootPath') : '\FTP_OUT'
-            FTPScriptPath		= Environment_Services('GetFTPRootPath') : '\FTPScript\'
-            FTPServerIP			= '172.23.28.185'	;* This is the new EU server (sappnfs.eu.infineon.com)
-            FTPUser				= 'prdopeni'
-            FTPPassWord			= 'sapprdopeni'
-            FTPCapturePath      = Environment_Services('GetApplicationRootPath') : '\SAP\FTPFiles\'
+    Begin case
+    	
+        Case SAPEnviron = 'PRD'
+            TransFilePathIn  = Environment_Services('GetFTPRootPath') : '\FTP_IN'
+            TransFilePathOut = Environment_Services('GetFTPRootPath') : '\FTP_OUT'
+            FTPScriptPath    = Environment_Services('GetFTPRootPath') : '\FTPScript\'
 
-        CASE SAPEnviron = 'QA'
-            TransFilePathIn		= Environment_Services('GetFTPRootPath') : '\FTP_IN_TEST'
-            TransFilePathOut	= Environment_Services('GetFTPRootPath') : '\FTP_OUT_TEST'
-            FTPScriptPath		= Environment_Services('GetFTPRootPath') : '\FTPScript_Test\'
-            FTPServerIP			= '172.28.150.80'		;* IFX EU FTP Server IP address or URL
-            FTPUser				= 'qasopeni'
-            FTPPassWord			= 'sapqasopeni'
-            FTPCapturePath      = Environment_Services('GetApplicationRootPath') : '\SAP\FTPFiles\'
+        Case SAPEnviron = 'QA'
+            TransFilePathIn  = Environment_Services('GetFTPRootPath') : '\FTP_IN_TEST'
+            TransFilePathOut = Environment_Services('GetFTPRootPath') : '\FTP_OUT_TEST'
+            FTPScriptPath    = Environment_Services('GetFTPRootPath') : '\FTPScript_Test\'
             
-        CASE 1
+        Case Otherwise$
             ErrMsg('Invalid SAPEnviron variable in obj_SAP')
-            RETURN
-    END CASE
+            return
+            
+    End case
 
     BaseFromSAPScript = 'lcd ':TransFilePathIn:CRLF$		;* Change local directory to C:\FTP_IN
 
@@ -130,7 +128,7 @@ Main:
         CASE Method = 'SendOutbound'	; GOSUB SendOutbound
         CASE Method = 'SendReconcile'	; GOSUB SendReconcile
         
-        CASE 1
+        CASE Otherwise$
             ErrorMsg = 'Unknown Method ':QUOTE(Method):' passed to routine.'
 
     END CASE
@@ -1504,4 +1502,3 @@ CheckForErrors:
 
 return 
 
-