diff --git a/ShippingTrackingUtilities/ShippingTrackingUtilies/ConnectionString.cs b/ShippingTrackingUtilities/ShippingTrackingUtilies/ConnectionString.cs
index 4e2c044..2d7d1af 100644
--- a/ShippingTrackingUtilities/ShippingTrackingUtilies/ConnectionString.cs
+++ b/ShippingTrackingUtilities/ShippingTrackingUtilies/ConnectionString.cs
@@ -8,6 +8,8 @@ public static class ConnectionString
 
         internal static string FEDEX_USER_KEY = "";
         internal static string FEDEX_USER_PASSWORD = "";
+        internal static string FEDEX_ACCOUNTNUMBER = "";
+        internal static string FEDEX_METERNUMBER = "";
 
         internal static bool ToShowDetails = false;
 
@@ -20,10 +22,12 @@ public static void SetupUPSCredential(string licenseNO)
             UPS_ACCESS_LICENSE_NO = licenseNO;
         }
 
-        public static void SetupFedExCredential(string userKey, string password)
+        public static void SetupFedExCredential(string userKey, string password, string accountnumber, string meternumber)
         {
             FEDEX_USER_KEY = userKey;
             FEDEX_USER_PASSWORD = password;
+            FEDEX_ACCOUNTNUMBER = accountnumber;
+            FEDEX_METERNUMBER = meternumber;
         }
     }
 }
diff --git a/ShippingTrackingUtilities/ShippingTrackingUtilies/FedExTracking.cs b/ShippingTrackingUtilities/ShippingTrackingUtilies/FedExTracking.cs
index 8674a8c..b1ba0bb 100644
--- a/ShippingTrackingUtilities/ShippingTrackingUtilies/FedExTracking.cs
+++ b/ShippingTrackingUtilities/ShippingTrackingUtilies/FedExTracking.cs
@@ -87,7 +87,7 @@ private ShippingResult FedExTrackingResultWrap(FedExTrackingResult.TrackReply re
 
         private string GetTrackingInfoFedExInString()
         {
-            string apiUrl = "https://gatewaybeta.fedex.com:443/xml"; 
+            string apiUrl = "https://gateway.fedex.com:443/xml"; 
 
             string xml = @"<TrackRequest xmlns='http://fedex.com/ws/track/v3'>"
                 + @"<WebAuthenticationDetail>"
@@ -109,7 +109,9 @@ private string GetTrackingInfoFedExInString()
             string raw_response = UPSRequest(apiUrl,
                 xml.Replace("%ACC_KEY%", ConnectionString.FEDEX_USER_KEY).
                     Replace("%ACC_PASSWORD%", ConnectionString.FEDEX_USER_PASSWORD).
-                    Replace("%TRACKINGNO%", trackingNumber));
+                    Replace("%TRACKINGNO%", trackingNumber).
+                    Replace("%ACC_NUMBER%",ConnectionString.FEDEX_ACCOUNTNUMBER).
+                    Replace("%ACC_METER_NUMBER%", ConnectionString.FEDEX_METERNUMBER));
 
             return raw_response;
         }