diff --git a/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/AuthorizationProcessUtil.java b/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/AuthorizationProcessUtil.java
index fce4236..387a9f8 100644
--- a/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/AuthorizationProcessUtil.java
+++ b/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/AuthorizationProcessUtil.java
@@ -55,7 +55,27 @@ public class AuthorizationProcessUtil {
                 if(field39.getDataStr().equals("000")){
                     emvOnlineResult.setRejCode("00");
                 }else{
-                    emvOnlineResult.setRejCode(field39.getDataStr());
+//                    emvOnlineResult.setRejCode(field39.getDataStr());
+                    switch (field39.getDataStr()) {
+                        case "103":
+                            emvOnlineResult.setRejCode("01");
+                            break;
+                        case "100":
+                            emvOnlineResult.setRejCode("05");
+                            break;
+                        case "117":
+                            emvOnlineResult.setRejCode("55");
+                            break;
+                        case "209":
+                            emvOnlineResult.setRejCode("04");
+                            break;
+                        case "104":
+                            emvOnlineResult.setRejCode("62");
+                            break;
+                        default:
+                            emvOnlineResult.setRejCode(field39.getDataStr());
+                            break;
+                    }
                 }
             }
 
@@ -165,15 +185,24 @@ public class AuthorizationProcessUtil {
                 importOnlineProcessStatus(SdkResult.Success,emvOnlineResult);
 
             } else {
-                equals = TextUtils.equals("3035", valueF039) || TextUtils.equals("3531", valueF039);
+//                equals = TextUtils.equals("3035", valueF039) || TextUtils.equals("3531", valueF039);
+//                if (equals) {
+//                    // Denial
+//                    importOnlineProcessStatus(SdkResult.Fail,emvOnlineResult);
+//                } else {
+//                    // Failed
+//                    importOnlineProcessStatus(SdkResult.Fail,emvOnlineResult);
+//                }
+                equals = TextUtils.equals("3035", valueF039) || TextUtils.equals("3531", valueF039) || TextUtils.equals("313033", valueF039);
                 if (equals) {
                     // Denial
-                    importOnlineProcessStatus(SdkResult.Fail,emvOnlineResult);
+                    importOnlineProcessStatus(SdkResult.Success,emvOnlineResult);
                 } else {
                     // Failed
-                    importOnlineProcessStatus(SdkResult.Fail,emvOnlineResult);
+                    importOnlineProcessStatus(SdkResult.Success,emvOnlineResult);
                 }
             }
+            LogUtil.d(TAG,"Field 39 value:"+valueF039);
             LogUtil.e(Constant.TAG, "status: " );
 
             String scriptResult = ByteUtil.bytes2HexStr(outData);
diff --git a/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/core_utils/SystemParamsSettings.java b/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/core_utils/SystemParamsSettings.java
index 3526404..fb5e440 100644
--- a/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/core_utils/SystemParamsSettings.java
+++ b/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/core_utils/SystemParamsSettings.java
@@ -45,7 +45,7 @@ public class SystemParamsSettings implements Serializable {
 //    private String tmsAddress = "https://api-tms-uat.kbzbank.com:8443/sirius";
 //    private String ereceiptAddress = "https://api-tms-uat.kbzbank.com:8443/receipt";    
     private String tmsAddress = "https://sirius-nest.utsmyanmar.com/api/v1";
-    private String ereceiptAddress = "https://receipt-nest.utsmyanmar.com/api/v1";
+    private String ereceiptAddress = "https://receipt-nest.utsmyanmar.com";
 
     private String binValues = "";
     private String restrictedBinValues = "";