diff --git a/Block/Promotion/AslowasAbstract.php b/Block/Promotion/AslowasAbstract.php
index f15d134a..d5738240 100644
--- a/Block/Promotion/AslowasAbstract.php
+++ b/Block/Promotion/AslowasAbstract.php
@@ -23,7 +23,7 @@ abstract class AslowasAbstract extends \Magento\Framework\View\Element\Template
      *
      * @var array
      */
-    protected $data = ['logo', 'script', 'public_api_key'];
+    protected $data = ['logo', 'script', 'public_api_key', 'country_code', 'locale'];
 
     /**
      * Colors which could be set in "data-affirm-color".
@@ -208,6 +208,8 @@ public function process()
                 $config = $configProvider['payment'][ConfigProvider::CODE];
                 $this->setData('script', $config['script']);
                 $this->setData('public_api_key', $config['apiKeyPublic']);
+                $this->setData('country_code', $config['countryCode']);
+                $this->setData('locale', $config['locale']);
             }
             // Set max and min options amounts from payment configuration
             $this->setData('min_order_total', $this->getPaymentConfigValue('min_order_total'));
diff --git a/Block/Promotion/Banners.php b/Block/Promotion/Banners.php
index 57e29626..ef0caf4a 100644
--- a/Block/Promotion/Banners.php
+++ b/Block/Promotion/Banners.php
@@ -232,6 +232,8 @@ public function getOptions()
             if ($config && isset($config['script']) && isset($config['apiKeyPublic'])) {
                 $options['script'] = $config['script'];
                 $options['public_api_key'] = $config['apiKeyPublic'];
+                $options['country_code'] = $config['countryCode'];
+                $options['locale'] = $config['locale'];
             }
         }
         if ($this->isProductPage()) {
diff --git a/Block/Promotion/CartPage/Aslowas.php b/Block/Promotion/CartPage/Aslowas.php
index b897089c..f1b6ae7c 100644
--- a/Block/Promotion/CartPage/Aslowas.php
+++ b/Block/Promotion/CartPage/Aslowas.php
@@ -21,7 +21,7 @@ class Aslowas extends AslowasAbstract
      *
      * @var array
      */
-    protected $data = ['logo', 'script', 'public_api_key', 'min_order_total', 'max_order_total', 'element_id'];
+    protected $data = ['logo', 'script', 'public_api_key', 'min_order_total', 'max_order_total', 'element_id', 'country_code', 'locale'];
 
     /**
      * Checkout session
diff --git a/Block/Promotion/Pixel/Confirm.php b/Block/Promotion/Pixel/Confirm.php
index dd362c6e..d57a6a26 100644
--- a/Block/Promotion/Pixel/Confirm.php
+++ b/Block/Promotion/Pixel/Confirm.php
@@ -149,6 +149,8 @@ public function getOptions()
             if ($config && isset($config['script']) && isset($config['apiKeyPublic'])) {
                 $options['script'] = $config['script'];
                 $options['public_api_key'] = $config['apiKeyPublic'];
+                $options['country_code'] = $config['countryCode'];
+                $options['locale'] = $config['locale'];
             }
         }
         return $options;
diff --git a/Block/Promotion/ProductPage/Aslowas.php b/Block/Promotion/ProductPage/Aslowas.php
index 4dab4ebf..60eabc46 100644
--- a/Block/Promotion/ProductPage/Aslowas.php
+++ b/Block/Promotion/ProductPage/Aslowas.php
@@ -33,7 +33,7 @@ class Aslowas extends AslowasAbstract
      * @var array
      */
     protected $data = ['logo', 'script', 'public_api_key', 'min_order_total', 'max_order_total',
-            'selector', 'currency_rate', 'backorders_options', 'element_id'];
+            'selector', 'currency_rate', 'backorders_options', 'element_id', 'country_code', 'locale'];
 
     /**
      * Validate block before showing on front
diff --git a/Gateway/Helper/Util.php b/Gateway/Helper/Util.php
index 5848d5d2..e1e389ea 100644
--- a/Gateway/Helper/Util.php
+++ b/Gateway/Helper/Util.php
@@ -35,6 +35,11 @@ class Util
      */
     const IDEMPOTENCY_KEY = "Idempotency-Key";
 
+    /**
+     * Country code
+     */
+    const COUNTRY_CODE = "Country-Code";
+
     /**
      * Constructor
      *
diff --git a/Gateway/Http/AbstractTransferFactory.php b/Gateway/Http/AbstractTransferFactory.php
index a241feb8..dde4795a 100644
--- a/Gateway/Http/AbstractTransferFactory.php
+++ b/Gateway/Http/AbstractTransferFactory.php
@@ -29,6 +29,18 @@
  */
 abstract class AbstractTransferFactory implements TransferFactoryInterface
 {
+    /**
+     * Constants
+     */
+    const MODE = 'mode';
+    const SANDBOX = 'sandbox';
+    const PRODUCTION = 'production';
+    const COUNTRY_CODE_USA = 'USA';
+    const COUNTRY_CODE_CAN = 'CAN';
+    const SUFFIX_CANADA = '_ca';
+    /**
+
+
     /**
      * Config
      *
@@ -80,18 +92,20 @@ public function __construct(
      * Get public API key
      *
      * @param int $storeId
+     * @param string $country_code
      * @return string
      */
-    protected function getPublicApiKey($storeId)
+    protected function getPublicApiKey($storeId, $country_code)
     {
+        $country_suffix = $this->getApiKeyNameByCountry($country_code);
         if(!empty($storeId)){
-            return $this->config->getValue('mode', $storeId) == 'sandbox'
-                ? $this->config->getValue('public_api_key_sandbox', $storeId)
-                : $this->config->getValue('public_api_key_production', $storeId);
+            return $this->config->getValue(self::MODE, $storeId) == self::SANDBOX
+                ? $this->config->getValue('public_api_key_sandbox' . $country_suffix, $storeId)
+                : $this->config->getValue('public_api_key_production' . $country_suffix, $storeId);
         } else {
-            return $this->config->getValue('mode') == 'sandbox'
-                ? $this->config->getValue('public_api_key_sandbox')
-                : $this->config->getValue('public_api_key_production');
+            return $this->config->getValue('mode') == self::SANDBOX
+                ? $this->config->getValue('public_api_key_sandbox' . $country_suffix)
+                : $this->config->getValue('public_api_key_production' . $country_suffix);
         }
 
     }
@@ -100,18 +114,20 @@ protected function getPublicApiKey($storeId)
      * Get private API key
      *
      * @param int $storeId
+     * @param string $country_code
      * @return string
      */
-    protected function getPrivateApiKey($storeId)
+    protected function getPrivateApiKey($storeId, $country_code)
     {
+        $country_suffix = $this->getApiKeyNameByCountry($country_code);
         if(!empty($storeId)){
-            return $this->config->getValue('mode', $storeId) == 'sandbox'
-                ? $this->config->getValue('private_api_key_sandbox', $storeId)
-                : $this->config->getValue('private_api_key_production', $storeId);
+            return $this->config->getValue('mode', $storeId) == self::SANDBOX
+                ? $this->config->getValue('private_api_key_sandbox' . $country_suffix, $storeId)
+                : $this->config->getValue('private_api_key_production' . $country_suffix, $storeId);
         } else {
-            return $this->config->getValue('mode') == 'sandbox'
-                ? $this->config->getValue('private_api_key_sandbox')
-                : $this->config->getValue('private_api_key_production');
+            return $this->config->getValue('mode') == self::SANDBOX
+                ? $this->config->getValue('private_api_key_sandbox' . $country_suffix)
+                : $this->config->getValue('private_api_key_production' . $country_suffix);
         }
     }
 
@@ -124,4 +140,24 @@ protected function getStoreId()
     {
         return $this->_storeManager->getStore()->getId();
     }
+
+    /**
+     * Map country code to API key config suffix name
+     *
+     * @param string $country_code
+     * @return string
+     */
+    protected function getApiKeyNameByCountry($country_code)
+    {
+        $_suffix = '';
+        $countryCodeToSuffix = array(
+            self::COUNTRY_CODE_CAN => self::SUFFIX_CANADA,
+            self::COUNTRY_CODE_USA => '',
+        );
+
+        if (isset($country_code)) {
+            $_suffix = $countryCodeToSuffix[$country_code] ?: '';
+        }
+        return $_suffix;
+    }
 }
diff --git a/Gateway/Http/Client/ClientService.php b/Gateway/Http/Client/ClientService.php
index 3fcd439d..415efcc5 100644
--- a/Gateway/Http/Client/ClientService.php
+++ b/Gateway/Http/Client/ClientService.php
@@ -123,16 +123,17 @@ public function placeRequest(TransferInterface $transferObject)
             $client = $this->httpClientFactory->create();
             $client->setUri($requestUri);
             $client->setAuth($transferObject->getAuthUsername(), $transferObject->getAuthPassword());
+            $headers = $transferObject->getHeaders();
             if (strpos($transferObject->getUri(), $this->action::API_TRANSACTIONS_PATH) !== false) {
                 $idempotencyKey = $this->util->generateIdempotencyKey();
-                $client->setHeaders([Util::IDEMPOTENCY_KEY => $idempotencyKey]);
+                $headers[Util::IDEMPOTENCY_KEY] = $idempotencyKey;
             }
+            $client->setHeaders($headers);
             if (!empty($transferObject->getBody())) {
                 $data = $transferObject->getBody();
                 $data = json_encode($data, JSON_UNESCAPED_SLASHES);
                 $client->setRawData($data, 'application/json');
             }
-
             $response = $client->request($transferObject->getMethod());
             $rawResponse = $response->getRawBody();
             $response = $this->converter->convert($rawResponse);
diff --git a/Gateway/Http/TransferFactory.php b/Gateway/Http/TransferFactory.php
index db345e19..5cbbbd1e 100644
--- a/Gateway/Http/TransferFactory.php
+++ b/Gateway/Http/TransferFactory.php
@@ -37,12 +37,16 @@ public function create(array $request)
         $method = isset($request['method']) ? $request['method'] : ClientService::POST;
         // Admin actions will include store id in the request
         $storeId = isset($request['storeId']) ? $request['storeId'] : $this->getStoreId();
+        $country_code = $request['country_code'] ?: 'USA';
         return $this->transferBuilder
             ->setMethod($method)
-            ->setHeaders(['Content-Type' => 'application/json'])
+            ->setHeaders([
+                'Content-Type' => 'application/json',
+                'Country-Code' => $country_code
+            ])
             ->setBody($request['body'])
-            ->setAuthUsername($this->getPublicApiKey($storeId))
-            ->setAuthPassword($this->getPrivateApiKey($storeId))
+            ->setAuthUsername($this->getPublicApiKey($storeId, $country_code))
+            ->setAuthPassword($this->getPrivateApiKey($storeId, $country_code))
             ->setUri($this->getApiUrl($request['path'], $storeId))
             ->build();
     }
diff --git a/Gateway/Request/AbstractDataBuilder.php b/Gateway/Request/AbstractDataBuilder.php
index f3c8963e..2a09002f 100644
--- a/Gateway/Request/AbstractDataBuilder.php
+++ b/Gateway/Request/AbstractDataBuilder.php
@@ -34,6 +34,8 @@ abstract class AbstractDataBuilder implements BuilderInterface
     const CHECKOUT_TOKEN = 'checkout_token';
     const TRANSACTION_ID = 'transaction_id';
     const CHARGE_ID = 'charge_id';
+    const COUNTRY_CODE = 'country_code';
+    const DEFAULT_COUNTRY_CODE = 'USA';
     /**#@-*/
 
     /**
diff --git a/Gateway/Request/AuthorizationRequest.php b/Gateway/Request/AuthorizationRequest.php
index ea2cb37f..ce927a53 100644
--- a/Gateway/Request/AuthorizationRequest.php
+++ b/Gateway/Request/AuthorizationRequest.php
@@ -44,11 +44,13 @@ public function build(array $buildSubject)
         $paymentDataObject = $buildSubject['payment'];
         $payment = $paymentDataObject->getPayment();
         $token = $payment->getAdditionalInformation(self::CHECKOUT_TOKEN);
+        $countryCode = $payment->getAdditionalInformation(self::COUNTRY_CODE) ?: self::DEFAULT_COUNTRY_CODE;
         return [
             'body' => [
                 self::TRANSACTION_ID => $token
             ],
-            'path' => ''
+            'path' => '',
+            'country_code' => $countryCode
         ];
     }
 }
diff --git a/Gateway/Request/CaptureRequest.php b/Gateway/Request/CaptureRequest.php
index e37aabe0..f37766c3 100644
--- a/Gateway/Request/CaptureRequest.php
+++ b/Gateway/Request/CaptureRequest.php
@@ -46,12 +46,13 @@ public function build(array $buildSubject)
         $payment = $paymentDataObject->getPayment();
         $transactionId = $payment->getAdditionalInformation(self::TRANSACTION_ID) ?:
             $payment->getAdditionalInformation(self::CHARGE_ID);
+        $countryCode = $payment->getAdditionalInformation(self::COUNTRY_CODE) ?: self::DEFAULT_COUNTRY_CODE;
         $order = $payment->getOrder();
         $storeId = isset($order) ? $order->getStoreId() : $this->_storeManager->getStore()->getId();
         if (!$storeId) {
             $storeId = null;
         }
-        if ($this->affirmPaymentConfig->getPartialCapture()) {
+        if ($this->affirmPaymentConfig->getPartialCapture($countryCode)) {
             $_amount = $buildSubject['amount'] ? Util::formatToCents($buildSubject['amount']) : null;
             $_body = [
                 'amount' => $_amount
@@ -62,7 +63,8 @@ public function build(array $buildSubject)
         return [
             'path' => "{$transactionId}/capture",
             'storeId' => $storeId,
-            'body' => $_body
+            'body' => $_body,
+            'country_code' => $countryCode,
         ];
     }
 }
diff --git a/Gateway/Request/PreAuthorizationRequest.php b/Gateway/Request/PreAuthorizationRequest.php
index 5de7eed4..a7fa8b89 100644
--- a/Gateway/Request/PreAuthorizationRequest.php
+++ b/Gateway/Request/PreAuthorizationRequest.php
@@ -49,10 +49,12 @@ public function build(array $buildSubject)
         $paymentDataObject = $buildSubject['payment'];
         $payment = $paymentDataObject->getPayment();
         $token = $payment->getAdditionalInformation(self::CHECKOUT_TOKEN);
+        $countryCode = $payment->getAdditionalInformation(self::COUNTRY_CODE) ?: self::DEFAULT_COUNTRY_CODE;
         return [
             'body' => '',
             'path' => $token,
-            'method' => self::GET
+            'method' => self::GET,
+            'country_code' => $countryCode
         ];
     }
 }
diff --git a/Gateway/Request/RefundRequest.php b/Gateway/Request/RefundRequest.php
index 0f1a0b81..fbf05fdc 100644
--- a/Gateway/Request/RefundRequest.php
+++ b/Gateway/Request/RefundRequest.php
@@ -46,7 +46,9 @@ public function build(array $buildSubject)
         $payment = $paymentDataObject->getPayment();
         $transactionId = $payment->getAdditionalInformation(self::TRANSACTION_ID) ?:
             $payment->getAdditionalInformation(self::CHARGE_ID);
-        $amountInCents = Util::formatToCents($buildSubject['amount']);
+        $countryCode = $payment->getAdditionalInformation(self::COUNTRY_CODE) ?: self::DEFAULT_COUNTRY_CODE;
+        $creditMemoAmount = $payment->getCreditmemo()->getGrandTotal();
+        $amountInCents = Util::formatToCents($creditMemoAmount);
         $order = $payment->getOrder();
         if($order) {
             $storeId = $order->getStoreId();
@@ -59,7 +61,8 @@ public function build(array $buildSubject)
                 'amount' => $amountInCents
             ],
             'path' => "{$transactionId}/refund",
-            'storeId' => $storeId
+            'storeId' => $storeId,
+            'country_code' => $countryCode,
         ];
     }
 }
diff --git a/Gateway/Request/VoidRequest.php b/Gateway/Request/VoidRequest.php
index 67ea249b..50e1aed3 100644
--- a/Gateway/Request/VoidRequest.php
+++ b/Gateway/Request/VoidRequest.php
@@ -45,6 +45,7 @@ public function build(array $buildSubject)
         $payment = $paymentDataObject->getPayment();
         $transactionId = $payment->getAdditionalInformation(self::TRANSACTION_ID) ?:
             $payment->getAdditionalInformation(self::CHARGE_ID);
+        $countryCode = $payment->getAdditionalInformation(self::COUNTRY_CODE) ?: self::DEFAULT_COUNTRY_CODE;
         $order = $payment->getOrder();
         if($order) {
             $storeId = $order->getStoreId();
@@ -55,7 +56,8 @@ public function build(array $buildSubject)
         return [
             'body' => [],
             'path' => "{$transactionId}/void",
-            'storeId' => $storeId
+            'storeId' => $storeId,
+            'country_code' => $countryCode,
         ];
     }
 }
diff --git a/Gateway/Validator/Client/PaymentActionsValidator.php b/Gateway/Validator/Client/PaymentActionsValidator.php
index c14c495d..260f5e2d 100644
--- a/Gateway/Validator/Client/PaymentActionsValidator.php
+++ b/Gateway/Validator/Client/PaymentActionsValidator.php
@@ -27,12 +27,34 @@
 class PaymentActionsValidator extends AbstractResponseValidator
 {
     /**
-     * @inheritdoc
+     * Validate response
+     *
+     * @param array $validationSubject
+     * @return \Magento\Payment\Gateway\Validator\ResultInterface
      */
     public function validate(array $validationSubject)
     {
         $response = SubjectReader::readResponse($validationSubject);
-        $amount = SubjectReader::readAmount($validationSubject);
+        $amount = '';
+
+        if ( (isset($response['checkout_status']) && $response['checkout_status'] == 'confirmed')
+            || (isset($response['status']) && $response['status'] == 'authorized')
+            || (isset($response['type']) && $response['type'] == 'capture'))
+        {
+            // Pre-Auth/Auth/Capture uses amount_ordered from payment
+            $_payment = $validationSubject['payment']->getPayment();
+            $payment_data = $_payment->getData();
+            $amount = $payment_data['amount_ordered'];
+        } elseif ( (isset($response['type']) && $response['type'] == 'refund') ) {
+            // Refund (including partial) uses grand_total from creditmemo (credit memo invoice)
+            $_payment = $validationSubject['payment']->getPayment();
+            $_creditMemo = $_payment->getData()['creditmemo'];
+            $amount = $_creditMemo->getGrandTotal();
+        } else {
+            // Partial capture (US only) uses validationSubject
+            $amount = SubjectReader::readAmount($validationSubject);
+        }
+
         $amountInCents = Util::formatToCents($amount);
 
         $errorMessages = [];
diff --git a/Helper/Payment.php b/Helper/Payment.php
index bf920dfa..0a217105 100644
--- a/Helper/Payment.php
+++ b/Helper/Payment.php
@@ -38,9 +38,10 @@
 class Payment
 {
     /**
-     * Country code for address validation
+     * Region (country) code for address validation
      */
-    const VALIDATE_COUNTRY = 'US';
+    const VALID_REGIONS = array('US', 'CA');
+    const DEFAULT_REGION = 'US';
 
     /**
      * Affirm payment facade
@@ -311,7 +312,7 @@ public function getConfigurableProductBackordersOptions(Product $product = null)
     public function validateVirtual()
     {
         if ($this->quote->getIsVirtual() && !$this->quote->getCustomerIsGuest()) {
-            $countryId = self::VALIDATE_COUNTRY;
+            $countryId = self::DEFAULT_REGION;
             // get customer addresses list
             $addresses = $this->quote->getCustomer()->getAddresses();
             // get default shipping address for the customer
@@ -321,12 +322,14 @@ public function validateVirtual()
                 foreach ($addresses as $address) {
                     if ($address->getId() == $defaultShipping) {
                         $countryId = $address->getCountryId();
+                        if (in_array($countryId, self::VALID_REGIONS)) {
+                            return true;
+                        } else {
+                            return false;
+                        }
                         break;
                     }
                 }
-                if ($countryId != self::VALIDATE_COUNTRY) {
-                    return false;
-                }
             }
         }
         return true;
diff --git a/Model/Adminhtml/Source/PaymentRegion.php b/Model/Adminhtml/Source/PaymentRegion.php
new file mode 100644
index 00000000..82f302a7
--- /dev/null
+++ b/Model/Adminhtml/Source/PaymentRegion.php
@@ -0,0 +1,33 @@
+<?php
+namespace Astound\Affirm\Model\Adminhtml\Source;
+
+use Magento\Framework\Option\ArrayInterface;
+
+/**
+ * Class PaymentRegion
+ * Source model for the system configuration
+ * retrieve payment region (country) options.
+ *
+ * @package Astound\Affirm\Model\Adminhtml\Source
+ */
+class PaymentRegion implements ArrayInterface
+{
+    /**
+     * Return array of options as value-label pairs
+     *
+     * @return array Format: array(array('value' => '<value>', 'label' => '<label>'), ...)
+     */
+    public function toOptionArray()
+    {
+        return [
+            [
+                'value' => 'US',
+                'label' => __('United States'),
+            ],
+            [
+                'value' => 'CA',
+                'label' => __('Canada'),
+            ]
+        ];
+    }
+}
diff --git a/Model/AffirmCheckoutManager.php b/Model/AffirmCheckoutManager.php
index dc1f819d..98d8df66 100644
--- a/Model/AffirmCheckoutManager.php
+++ b/Model/AffirmCheckoutManager.php
@@ -225,6 +225,8 @@ public function initCheckout()
             $productType = false;
         }
 
+        $response['currency'] = $this->affirmConfig->getCurrency();
+
 
         $response['address'] = [
             'shipping' => $productType ? $this->getShippingAddress() :  $this->getBillingAddress(),
diff --git a/Model/Checkout.php b/Model/Checkout.php
index 87b70e12..9dd5af93 100644
--- a/Model/Checkout.php
+++ b/Model/Checkout.php
@@ -277,6 +277,9 @@ protected function initToken($token)
         if ($token) {
             $payment = $this->quote->getPayment();
             $payment->setAdditionalInformation('checkout_token', $token);
+            $quoteCurrencyCode = $payment->getQuote()->getCurrency()->getQuoteCurrencyCode();
+            $countryCode = $this->getCountryCodeByCurrency($quoteCurrencyCode);
+            $payment->setAdditionalInformation('country_code', $countryCode[1]);
             $payment->save();
         }
     }
@@ -298,4 +301,19 @@ public function setCustomerWithAddressChange(
         $this->customerId = $customerData->getId();
         return $this;
     }
+
+    /**
+     * Maps currency code to country code
+     *
+     * @param string $currencyCode
+     * @return string
+     */
+    protected function getCountryCodeByCurrency($currencyCode)
+    {
+        $currency_map = array(
+            "USD" => ['US','USA'],
+            "CAD" => ['CA','CAN']
+        );
+        return $currency_map[$currencyCode];
+    }
 }
diff --git a/Model/Config.php b/Model/Config.php
index 47a68c45..d64c5b2d 100644
--- a/Model/Config.php
+++ b/Model/Config.php
@@ -39,6 +39,7 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Locale\Resolver;
 use Magento\Directory\Model\Currency;
 use Magento\Tax\Model\Config as TaxConfig;
 
@@ -58,15 +59,30 @@ class Config implements ConfigInterface
     const KEY_PRIVATE_KEY_SANDBOX = 'private_api_key_sandbox';
     const KEY_PUBLIC_KEY_PRODUCTION = 'public_api_key_production';
     const KEY_PRIVATE_KEY_PRODUCTION = 'private_api_key_production';
+    const KEY_PUBLIC_KEY_SANDBOX_CA = 'public_api_key_sandbox_ca';
+    const KEY_PRIVATE_KEY_SANDBOX_CA = 'private_api_key_sandbox_ca';
+    const KEY_PUBLIC_KEY_PRODUCTION_CA = 'public_api_key_production_ca';
+    const KEY_PRIVATE_KEY_PRODUCTION_CA = 'private_api_key_production_ca';
     const KEY_MINIMUM_ORDER_TOTAL = 'minimum_order_total';
     const KEY_MAXIMUM_ORDER_TOTAL = 'maximum_order_total';
     const KEY_SORT_ORDER = 'sort_order';
-    const API_URL_SANDBOX = 'https://sandbox.affirm.com';
-    const API_URL_PRODUCTION = 'https://api.affirm.com';
+    const API_URL_SANDBOX = 'https://api.global-sandbox.affirm.com';
+    const API_URL_PRODUCTION = 'https://api.global.affirm.com';
+    const JS_URL_SANDBOX = 'https://cdn1-sandbox.affirm.com/js/v2/affirm.js';
+    const JS_URL_PRODUCTION = 'https://cdn1.global.affirm.com/js/v2/affirm.js';
     const METHOD_BML = 'affirm_promo';
     const KEY_ASLOWAS = 'affirm_aslowas';
     const KEY_MFP = 'affirm_mfp';
-    const CURRENCY_CODE = 'USD';
+    const VALID_CURRENCIES = array('USD', 'CAD');
+    const ACCEPTED_LOCALES = array('en_CA', 'fr_CA', 'en_US');
+    const COUNTRY_CODE_USA = 'USA';
+    const COUNTRY_CODE_CAN = 'CAN';
+    const CURRENCY_CODE_USD = 'USD';
+    const CURRENCY_CODE_CAD = 'CAD';
+    const LOCALE_EN_CA = 'en_CA';
+    const LOCALE_FR_CA = 'fr_CA';
+    const LOCALE_EN_US = 'en_US';
+    const SUFFIX_CANADA = '_ca';
     const KEY_ASLOWAS_DEVELOPER = 'affirm_aslowas_developer';
     const KEY_PIXEL = 'affirm_pixel';
     /**#@-*/
@@ -106,6 +122,13 @@ class Config implements ConfigInterface
      */
     protected $storeManager;
 
+    /**
+     * Store locale resolver
+     *
+     * @var \Magento\Framework\Locale\Resolver
+     */
+    protected $_store;
+
     /**
      * Path pattern
      *
@@ -148,18 +171,21 @@ class Config implements ConfigInterface
      *
      * @param ScopeConfigInterface  $scopeConfig
      * @param StoreManagerInterface $storeManager
+     * @param Resolver              $store
      * @param Currency              $currency
      * @param TaxConfig             $taxConfig
      */
     public function __construct(
         ScopeConfigInterface $scopeConfig,
         StoreManagerInterface $storeManager,
+        Resolver $store,
         Currency $currency,
         TaxConfig $taxConfig
     )
     {
         $this->scopeConfig = $scopeConfig;
         $this->storeManager = $storeManager;
+        $this->_store = $store;
         $this->currency = $currency;
         $this->taxConfig = $taxConfig;
     }
@@ -191,11 +217,7 @@ public function isCurrencyValid()
     {
         $currentCurrency = $this->storeManager->getStore()
             ->getBaseCurrencyCode();
-        $isValid = true;
-        if ($currentCurrency != self::CURRENCY_CODE) {
-            $isValid = false;
-        }
-        return $isValid;
+        return in_array($currentCurrency, self::VALID_CURRENCIES);
     }
 
     /**
@@ -207,11 +229,7 @@ public function isCurrentStoreCurrencyUSD()
     {
         $currentCurrency = $this->storeManager->getStore()
             ->getCurrentCurrencyCode();
-        $isUSD = true;
-        if ($currentCurrency != self::CURRENCY_CODE) {
-            $isUSD = false;
-        }
-        return $isUSD;
+        return $currentCurrency == self::CURRENCY_CODE_USD;
     }
 
     /**
@@ -223,7 +241,7 @@ public function getUSDCurrencyRate()
     {
         $currentStore = $this->getCurrentStore();
         $currencyCode = $currentStore->getCurrentCurrencyCode();
-        $rate = $this->currency->getCurrencyRates('USD', $currencyCode);
+        $rate = $this->currency->getCurrencyRates(self::CURRENCY_CODE_USD, $currencyCode);
         return isset($rate[$currencyCode]) ? $rate[$currencyCode] : false;
     }
 
@@ -279,9 +297,12 @@ public function getMode()
     public function getPrivateApiKey()
     {
         $storeId = $this->getCurrentStoreId();
+        $currentCurrency = $this->storeManager->getStore()
+            ->getCurrentCurrencyCode();
+        $region_suffix = $this->getApiKeyNameByCurrency($currentCurrency);
         return ($this->getMode() == 'sandbox') ?
-            $this->getValue(self::KEY_PRIVATE_KEY_SANDBOX, $storeId) :
-            $this->getValue(self::KEY_PRIVATE_KEY_PRODUCTION, $storeId);
+            $this->getValue(self::KEY_PRIVATE_KEY_SANDBOX . $region_suffix, $storeId) :
+            $this->getValue(self::KEY_PRIVATE_KEY_PRODUCTION . $region_suffix, $storeId);
     }
 
     /**
@@ -292,9 +313,12 @@ public function getPrivateApiKey()
     public function getPublicApiKey()
     {
         $storeId = $this->getCurrentStoreId();
+        $currentCurrency = $this->storeManager->getStore()
+            ->getCurrentCurrencyCode();
+        $region_suffix = $this->getApiKeyNameByCurrency($currentCurrency);
         return ($this->getMode() == 'sandbox') ?
-            $this->getValue(self::KEY_PUBLIC_KEY_SANDBOX, $storeId) :
-            $this->getValue(self::KEY_PUBLIC_KEY_PRODUCTION, $storeId);
+            $this->getValue(self::KEY_PUBLIC_KEY_SANDBOX . $region_suffix, $storeId) :
+            $this->getValue(self::KEY_PUBLIC_KEY_PRODUCTION . $region_suffix, $storeId);
     }
 
     /**
@@ -316,21 +340,49 @@ public function getApiUrl()
      */
     public function getScript()
     {
-        $apiUrl = $this->getApiUrl();
-        $prefix = "cdn1";
-        if ($apiUrl) {
-            if ($this->getMode() == 'sandbox') {
-                $pattern = '~(http|https)://~';
-                $replacement = '-';
-            } else {
-                $pattern = '~(http|https)://api~';
-                $replacement = '';
+        return ($this->getMode() == 'sandbox') ?
+            self::JS_URL_SANDBOX :
+            self::JS_URL_PRODUCTION;
+    }
+
+    /**
+     * Get inline checkout edu modal (US only)
+     *
+     * @return bool
+     */
+    public function getEdu()
+    {
+        return ($this->getConfigData('edu') && $this->getCountryCode() == self::COUNTRY_CODE_USA);
+    }
+
+    public function getCountryCode()
+    {
+        $currency = $this->getCurrency();
+        if ($currency == self::CURRENCY_CODE_CAD) {
+            return self::COUNTRY_CODE_CAN;
+        } else {
+            return self::COUNTRY_CODE_USA;
+        }
+    }
+
+    public function getLocale()
+    {
+        $currency = $this->getCurrency();
+        if ($currency == self::CURRENCY_CODE_CAD) {
+            $currentLocale = $this->_store->getLocale();
+            if (in_array($currentLocale, preg_grep('/(_CA)$/', self::ACCEPTED_LOCALES))) {
+                return $currentLocale;
             }
-            $apiString = preg_replace($pattern, $replacement, $apiUrl);
-            $result = 'https://' . $prefix . $apiString . '/js/v2/affirm.js';
-            return $result;
+            return self::LOCALE_EN_CA;
+        } else {
+            return self::LOCALE_EN_US;
         }
-        return '';
+    }
+
+    public function getCurrency()
+    {
+        $currentStore = $this->getCurrentStore();
+        return $currentStore->getCurrentCurrencyCode();
     }
 
     /**
@@ -626,7 +678,11 @@ public function getAllAsLowAsConfig()
             'max_order_total' => $this->getConfigData('max_order_total'),
             'currency_rate' => !$this->isCurrentStoreCurrencyUSD() ? $this->getUSDCurrencyRate() : null,
             'display_cart_subtotal_incl_tax' => (int)$this->taxConfig->displayCartSubtotalInclTax(),
-            'display_cart_subtotal_excl_tax' => (int)$this->taxConfig->displayCartSubtotalExclTax()
+            'display_cart_subtotal_excl_tax' => (int)$this->taxConfig->displayCartSubtotalExclTax(),
+            'edu' => $this->getEdu(),
+            'locale' => $this->getLocale(),
+            'country_code' => $this->getCountryCode(),
+            'currency' => $this->getCurrency(),
         ];
     }
 
@@ -654,12 +710,32 @@ public function getCheckoutFlowType()
     }
 
     /**
-     * Get partial capture
+     * Get partial capture (US only)
      *
      * @return bool
      */
-    public function getPartialCapture()
+    public function getPartialCapture($countryCode = self::COUNTRY_CODE_USA)
     {
-        return $this->getConfigData('partial_capture');
+        return $this->getConfigData('partial_capture') && $countryCode == self::COUNTRY_CODE_USA;
+    }
+
+    /**
+     * Map currency to API key config suffix name
+     *
+     * @param string $currency_code
+     * @return string
+     */
+    protected function getApiKeyNameByCurrency($currency_code)
+    {
+        $_suffix = '';
+        $currencyCodeToSuffix = array(
+            self::CURRENCY_CODE_CAD => self::SUFFIX_CANADA,
+            self::CURRENCY_CODE_USD => '',
+        );
+
+        if (isset($currency_code)) {
+            $_suffix = $currencyCodeToSuffix[$currency_code] ?: '';
+        }
+        return $_suffix;
     }
 }
diff --git a/Model/InlineCheckout.php b/Model/InlineCheckout.php
index 1fe16ac7..a708fa8e 100644
--- a/Model/InlineCheckout.php
+++ b/Model/InlineCheckout.php
@@ -161,11 +161,11 @@ private function formatAddress($address){
                     'last'  => $address->getLastName(),
                 ),
                 'address' => array(
-                    'line1'   => isset($street[0]) ? $street[0] : '',
-                    'line2'   => isset($street[1]) ? $street[1] : '',
+                    'street1'   => isset($street[0]) ? $street[0] : '',
+                    'street2'   => isset($street[1]) ? $street[1] : '',
                     'city'    => $address->getCity(),
-                    'state'   => $address->getRegion(),
-                    'zipcode' => $address->getPostcode(),
+                    'region1_code'   => $address->getRegion(),
+                    'postal_code' => $address->getPostcode(),
                     'country' => $address->getCountryId()
                 ),
                 'phone_number' => $address->getTelephone() ? $address->getTelephone() : '',
diff --git a/Model/Plugin/Category/ViewAbstract.php b/Model/Plugin/Category/ViewAbstract.php
index 3f700647..78f9165f 100755
--- a/Model/Plugin/Category/ViewAbstract.php
+++ b/Model/Plugin/Category/ViewAbstract.php
@@ -19,7 +19,7 @@ class ViewAbstract extends \Magento\Framework\DataObject
      *
      * @var array
      */
-    protected $data = ['logo', 'script', 'public_api_key'];
+    protected $data = ['logo', 'script', 'public_api_key', 'country_code', 'locale'];
 
     /**
      * Colors which could be set in "data-affirm-color".
@@ -98,6 +98,8 @@ public function __construct(
                 $config = $configProvider['payment'][ConfigProvider::CODE];
                 $this->setData('script', $config['script']);
                 $this->setData('public_api_key', $config['apiKeyPublic']);
+                $this->setData('country_code', $config['countryCode']);
+                $this->setData('locale', $config['locale']);
             }
             // Set max and min options amounts from payment configuration
             $this->setData('min_order_total', $this->getPaymentConfigValue('min_order_total'));
diff --git a/Model/Plugin/Order/AddressSave/Edit.php b/Model/Plugin/Order/AddressSave/Edit.php
index 1810d3f1..e4a7e882 100644
--- a/Model/Plugin/Order/AddressSave/Edit.php
+++ b/Model/Plugin/Order/AddressSave/Edit.php
@@ -123,11 +123,11 @@ public function afterExecute($controller , $method)
                         'full' => $newAddress['firstname'] . ' ' . $newAddress['lastname']
                     ),
                     'address' => array(
-                        'line1' => $street[0],
-                        'line2' => isset($street[1]) ? $street[1]: '' ,
-                        'state' => $newAddress['region'],
+                        'street1' => $street[0],
+                        'street2' => isset($street[1]) ? $street[1]: '' ,
+                        'region1_code' => $newAddress['region'],
                         'city' => $newAddress['city'],
-                        'zipcode' => $newAddress['postcode'],
+                        'postal_code' => $newAddress['postcode'],
                         'country' => $newAddress['country_id']
                     )
                 )
diff --git a/Model/Plugin/Payment/CanCapturePartial.php b/Model/Plugin/Payment/CanCapturePartial.php
index d1ac3dac..fbfbdb29 100644
--- a/Model/Plugin/Payment/CanCapturePartial.php
+++ b/Model/Plugin/Payment/CanCapturePartial.php
@@ -40,7 +40,8 @@ public function __construct(
    */
   public function afterCanCapturePartial(Payment $subject, $result)
   {
-    if (!$this->affirmPaymentConfig->getPartialCapture()) {
+    $countryCode = $subject->getData()['additional_information']['country_code'] ?: 'USA';
+    if (!$this->affirmPaymentConfig->getPartialCapture() || $countryCode != 'USA') {
       return false;
     }
     return $result;
diff --git a/Model/Ui/ConfigProvider.php b/Model/Ui/ConfigProvider.php
index 05432586..d33a12da 100644
--- a/Model/Ui/ConfigProvider.php
+++ b/Model/Ui/ConfigProvider.php
@@ -119,12 +119,15 @@ public function getConfig()
                         'financial_product_key' => null
                     ],
                     'script' => $this->affirmConfig->getScript(),
+                    'countryCode' => $this->affirmConfig->getCountryCode(),
+                    'locale' => $this->affirmConfig->getLocale(),
+                    'currency' => $this->affirmConfig->getCurrency(),
                     'redirectUrl' => $this->urlBuilder->getUrl('affirm/checkout/start', ['_secure' => true]),
                     'afterAffirmConf' => $this->config->getValue('after_affirm_conf'),
                     'logoSrc' => $this->config->getValue('icon'),
                     'info' => $this->config->getValue('info'),
                     'visibleType' => $this->config->getValue('control') ? true: false,
-                    'edu' => $this->config->getValue('edu') ? true : false
+                    'edu' => $this->affirmConfig->getEdu() ? true : false
                 ]
             ]
         ];
diff --git a/composer.json b/composer.json
index f60f413f..e7bfd78b 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
     "name": "affirm/magento2",
     "description": "Affirm's extension for the Magento 2 https://www.affirm.com/",
     "type": "magento2-module",
-    "version": "3.1.3",
+    "version": "3.2.0",
     "license": [
         "BSD-3-Clause"
     ],
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index 2b226ab4..8af84a33 100644
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -44,31 +44,82 @@
                     <label>Enabled</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
+                <field id="region" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <label>Region</label>
+                    <source_model>Astound\Affirm\Model\Adminhtml\Source\PaymentRegion</source_model>
+                </field>
                 <field id="mode" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Mode</label>
                     <source_model>Astound\Affirm\Model\Adminhtml\Source\ModeAction</source_model>
                 </field>
                 <field id="public_api_key_sandbox" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Public API Key</label>
-                    <depends><field id="*/*/mode">sandbox</field></depends>
+                    <label>Public API Key (US)</label>
+                    <depends>
+                        <field id="*/*/mode">sandbox</field>
+                        <field id="*/*/region">US</field>
+                    </depends>
                 </field>
                 <field id="private_api_key_sandbox" translate="label" type="obscure" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Private API Key</label>
+                    <label>Private API Key (US)</label>
                     <config_path>payment/affirm_gateway/private_api_key_sandbox</config_path>
                     <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
                     <attribute type="shared">1</attribute>
-                    <depends><field id="*/*/mode">sandbox</field></depends>
+                    <depends>
+                        <field id="*/*/mode">sandbox</field>
+                        <field id="*/*/region">US</field>
+                    </depends>
                 </field>
                 <field id="public_api_key_production" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Public API Key</label>
+                    <label>Public API Key (US)</label>
                     <config_path>payment/affirm_gateway/public_api_key_production</config_path>
-                    <depends><field id="*/*/mode">production</field></depends>
+                    <depends>
+                        <field id="*/*/mode">production</field>
+                        <field id="*/*/region">US</field>
+                    </depends>
                 </field>
                 <field id="private_api_key_production" translate="label" type="obscure" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Private API Key</label>
+                    <label>Private API Key (US)</label>
+                    <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
+                    <attribute type="shared">1</attribute>
+                    <depends>
+                        <field id="*/*/mode">production</field>
+                        <field id="*/*/region">US</field>
+                    </depends>
+                </field>
+                <field id="public_api_key_sandbox_ca" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <label>Public API Key (CA)</label>
+                    <depends>
+                        <field id="*/*/mode">sandbox</field>
+                        <field id="*/*/region">CA</field>
+                    </depends>
+                </field>
+                <field id="private_api_key_sandbox_ca" translate="label" type="obscure" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <label>Private API Key (CA)</label>
+                    <config_path>payment/affirm_gateway/private_api_key_sandbox_ca</config_path>
+                    <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
+                    <attribute type="shared">1</attribute>
+                    <depends>
+                        <field id="*/*/mode">sandbox</field>
+                        <field id="*/*/region">CA</field>
+                    </depends>
+                </field>
+                <field id="public_api_key_production_ca" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <label>Public API Key (CA)</label>
+                    <config_path>payment/affirm_gateway/public_api_key_production_ca</config_path>
+                    <depends>
+                        <field id="*/*/mode">production</field>
+                        <field id="*/*/region">CA</field>
+                    </depends>
+                </field>
+                <field id="private_api_key_production_ca" translate="label" type="obscure" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <label>Private API Key (CA)</label>
+                    <config_path>payment/affirm_gateway/private_api_key_production_ca</config_path>
                     <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
                     <attribute type="shared">1</attribute>
-                    <depends><field id="*/*/mode">production</field></depends>
+                    <depends>
+                        <field id="*/*/mode">production</field>
+                        <field id="*/*/region">CA</field>
+                    </depends>
                 </field>
                 <field id="payment_action" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>Payment Action</label>
@@ -78,6 +129,7 @@
                     <label>Enable Partial Capture</label>
                     <depends><field id="payment_action">authorize</field></depends>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                    <comment>Enable/Disable partial capture in order invoices interface (requires auhorize only payment action; US only)</comment>
                 </field>
                 <field id="disable_for_backordered_items" translate="label" type="select" sortOrder="72" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>Disable for backordered items</label>
@@ -132,7 +184,7 @@
                 <field id="edu" translate="label" type="select" sortOrder="180" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>Inline Checkout Messaging</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                    <comment>Enable/Disable Inline checkout value props on the checkout page when Affirm is selected as a payment method</comment>
+                    <comment>Enable/Disable Inline checkout value props on the checkout page when Affirm is selected as a payment method (US only)</comment>
                 </field>
                 <group id="notification" translate="label" type="text" sortOrder="180" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>Notification</label>
diff --git a/etc/config.xml b/etc/config.xml
index 19002655..e73093de 100644
--- a/etc/config.xml
+++ b/etc/config.xml
@@ -17,18 +17,21 @@
                 <active>0</active>
                 <debug>1</debug>
                 <model>OnePicaAffirmGatewayFacade</model>
+                <region>United States</region>
                 <mode>sandbox</mode>
                 <private_api_key_sandbox backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
                 <private_api_key_production backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
+                <private_api_key_sandbox_ca backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
+                <private_api_key_production_ca backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
                 <min_order_total>0.01</min_order_total>
                 <max_order_total>50000</max_order_total>
                 <payment_action>authorize</payment_action>
                 <partial_capture>0</partial_capture>
                 <disable_for_backordered_items>0</disable_for_backordered_items>
                 <allowspecific>1</allowspecific>
-                <specificcountry>US,AS,GU,MP,PR,VI</specificcountry>
+                <specificcountry>US,AS,GU,MP,PR,VI,CA</specificcountry>
                 <allowspecificcurrency>1</allowspecificcurrency>
-                <currency>USD</currency>
+                <currency>USD,CAD</currency>
                 <can_authorize>1</can_authorize>
                 <can_capture>1</can_capture>
                 <can_capture_partial>1</can_capture_partial>
diff --git a/etc/csp_whitelist.xml b/etc/csp_whitelist.xml
new file mode 100644
index 00000000..31908adf
--- /dev/null
+++ b/etc/csp_whitelist.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<csp_whitelist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Csp:etc/csp_whitelist.xsd">
+    <policies>
+        <policy id="script-src">
+            <values>
+                <value id="affirm_script" type="host">*.affirm.com</value>
+                <value id="affirm_script_ca" type="host">*.affirm.ca</value>
+            </values>
+        </policy>
+        <policy id="frame-src">
+            <values>
+                <value id="affirm_frame" type="host">*.affirm.com</value>
+                <value id="affirm_frame_ca" type="host">*.affirm.ca</value>
+            </values>
+        </policy>
+        <policy id="connect-src">
+            <values>
+                <value id="affirm_connect" type="host">*.affirm.com</value>
+                <value id="affirm_connect_ca" type="host">*.affirm.ca</value>
+            </values>
+        </policy>
+        <policy id="img-src">
+            <values>
+                <value id="affirm_assets" type="host">*.affirm.com</value>
+                <value id="affirm_assets_ca" type="host">*.affirm.ca</value>
+            </values>
+        </policy>
+    </policies>
+</csp_whitelist>
diff --git a/etc/module.xml b/etc/module.xml
index 747f9103..7f881d46 100644
--- a/etc/module.xml
+++ b/etc/module.xml
@@ -10,7 +10,7 @@
  */
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Astound_Affirm" setup_version="3.1.3">
+    <module name="Astound_Affirm" setup_version="3.2.0">
         <sequence>
             <module name="Magento_Checkout"/>
             <module name="Magento_Sales"/>
diff --git a/view/frontend/web/js/action/send-to-affirm-checkout.js b/view/frontend/web/js/action/send-to-affirm-checkout.js
index df1fbcd5..e5492ff4 100644
--- a/view/frontend/web/js/action/send-to-affirm-checkout.js
+++ b/view/frontend/web/js/action/send-to-affirm-checkout.js
@@ -17,11 +17,11 @@ define([
 
     var options = {
         public_api_key: window.checkoutConfig.payment['affirm_gateway'].apiKeyPublic,
-        script: window.checkoutConfig.payment['affirm_gateway'].script
+        script: window.checkoutConfig.payment['affirm_gateway'].script,
+        locale: window.checkoutConfig.payment['affirm_gateway'].locale,
+        country_code: window.checkoutConfig.payment['affirm_gateway'].countryCode,
     };
 
-    loadScript.loadScript(options);
-
     return function(response) {
         fullScreenLoader.startLoader();
         var result = JSON.parse(response),
@@ -32,21 +32,54 @@ define([
         if (giftWrapItems !== 'undefined') {
             affirmCheckout.addItems(giftWrapItems);
         }
+
+        _affirm_config = {
+            public_api_key: options.public_api_key, /* Use the PUBLIC API KEY Affirm sent you. */
+            script: options.script,
+            locale: options.locale,
+            country_code: options.country_code,
+        };
+        (function (m, g, n, d, a, e, h, c) {
+            var b = m[n] || {},
+                k = document.createElement(e),
+                p = document.getElementsByTagName(e)[0],
+                l = function (a, b, c) {
+                    return function () {
+                        a[b]._.push([c, arguments]);
+                    };
+                };
+            b[d] = l(b, d, "set");
+            var f = b[d];
+            b[a] = {};
+            b[a]._ = [];
+            f._ = [];
+            b._ = [];
+            b[a][h] = l(b, a, h);
+            b[c] = function () {
+                b._.push([h, arguments]);
+            };
+            a = 0;
+            for (c = "set add save post open empty reset on off trigger ready setProduct".split(" "); a < c.length; a++) f[c[a]] = l(b, d, c[a]);
+            a = 0;
+            for (c = ["get", "token", "url", "items"]; a < c.length; a++) f[c[a]] = function () {};
+            k.async = !0;
+            k.src = g[e];
+            p.parentNode.insertBefore(k, p);
+            delete g[e];
+            f(g);
+            m[n] = b;
+        })(window, _affirm_config, "affirm", "checkout", "ui", "script", "ready", "jsReady");
+
         try {
-            affirm.ui.error.on("close", function() {
-                //redirect to checkout cart in case if customer canceled or returned from error pop-up
-                $.mage.redirect(window.checkoutConfig.payment['affirm_gateway'].merchant.user_cancel_url);
-            });
             checkoutObj = affirmCheckout.getData();
             if (affirmCheckout.getFinancingProgram()) {
                 checkoutObj.financing_program = affirmCheckout.getFinancingProgram();
             }
-
             affirm.checkout(checkoutObj);
             affirm.checkout.post();
         } catch (err) {
             Messages.addErrorMessage({
-                    'message': $t('We have a problem with your affirm script loading, please verify your API URL!')}
+                'message': $t('We have a problem with your Affirm script loading, please verify your API URL!')}
             );
             fullScreenLoader.stopLoader();
         }
diff --git a/view/frontend/web/js/aslowasCC.js b/view/frontend/web/js/aslowasCC.js
index 6d1576f5..e2e49c3f 100644
--- a/view/frontend/web/js/aslowasCC.js
+++ b/view/frontend/web/js/aslowasCC.js
@@ -23,12 +23,8 @@ define(["jquery",
             if (newValue) {
                 price = newValue;
             }
-            if (price && price.base_grand_total) {
-                if (newValue) {
-                    result = price.base_grand_total.toString();
-                } else {
-                    result = price.base_grand_total;
-                }
+            if (price && price.grand_total) {
+                result = price.grand_total.toString();
                 aslowas.process(result, this.options);
             }
         },
diff --git a/view/frontend/web/js/aslowasMC.js b/view/frontend/web/js/aslowasMC.js
index 860e16c1..d9c0b89e 100644
--- a/view/frontend/web/js/aslowasMC.js
+++ b/view/frontend/web/js/aslowasMC.js
@@ -52,6 +52,8 @@ define(["jquery",
                 logo: (window.checkout && window.checkout.logo) ? window.checkout.logo : null,
                 script: (window.checkout && window.checkout.script) ? window.checkout.script : null,
                 public_api_key: (window.checkout && window.checkout.public_api_key) ? window.checkout.public_api_key : null,
+                country_code: (window.checkout && window.checkout.country_code) ? window.checkout.country_code : null,
+                locale: (window.checkout && window.checkout.locale) ? window.checkout.locale : null,
                 min_order_total: (window.checkout && window.checkout.min_order_total) ? window.checkout.min_order_total : null,
                 max_order_total: (window.checkout && window.checkout.max_order_total) ? window.checkout.max_order_total : null,
                 currency_rate: (window.checkout && window.checkout.currency_rate) ? window.checkout.currency_rate : null,
diff --git a/view/frontend/web/js/model/affirm.js b/view/frontend/web/js/model/affirm.js
index 099f3510..03e7606f 100644
--- a/view/frontend/web/js/model/affirm.js
+++ b/view/frontend/web/js/model/affirm.js
@@ -23,6 +23,9 @@ define([
         shippingAmount: null,
         tax_amount: null,
         total: null,
+        currency: configData.currency,
+        locale: configData.locale,
+        country_code: configData.CountryCode,
 
         /**
          * Get checkout data
@@ -45,7 +48,10 @@ define([
                 shipping: _self.prepareAddress('shipping'),
                 billing: _self.prepareAddress('billing'),
                 discounts: _self.discounts,
-                metadata: _self.metadata
+                metadata: _self.metadata,
+                currency: _self.currency,
+                locale: _self.locale,
+                country_code: _self.country_code
             }
         },
 
@@ -93,9 +99,9 @@ define([
          */
         prepareTotals: function() {
             var totals = quote.getTotals()();
-            this.shippingAmount = this.convertPriceToCents(totals.base_shipping_amount);
-            this.total = this.convertPriceToCents(totals.base_grand_total);
-            this.tax_amount = this.convertPriceToCents(totals.base_tax_amount);
+            this.shippingAmount = this.convertPriceToCents(totals.shipping_amount);
+            this.total = this.convertPriceToCents(totals.grand_total);
+            this.tax_amount = this.convertPriceToCents(totals.tax_amount);
         },
 
         /**
@@ -141,19 +147,19 @@ define([
                 street = this.address[type].address.line[0];
             }
             result["address"] = {
-                "line1": street,
+                "street1": street,
                 "city": address.city ? address.city : this.address[type].address.city,
-                "state": address.regionCode ? address.regionCode : this.address[type].address.state,
-                "zipcode": address.postcode ? address.postcode : this.address[type].address.postcode,
+                "region1_code": address.regionCode ? address.regionCode : this.address[type].address.state,
+                "postal_code": address.postcode ? address.postcode : this.address[type].address.postcode,
                 "country": address.countryId ? address.countryId : this.address[type].address.country
              };
             result["name"] = name;
             if (address.street !== undefined) {
                 if (address.street[1]) {
-                    result.address.line2 = address.street[1];
+                    result.address.street2 = address.street[1];
                 }
             } else if(this.address[type].address.line[1]) {
-                result.address.line2 = this.address[type].address.line[1]
+                result.address.street2 = this.address[type].address.line[1]
             }
             if (address.telephone) {
                 result.phone_number = address.telephone;
diff --git a/view/frontend/web/js/model/aslowas.js b/view/frontend/web/js/model/aslowas.js
index 261da998..c084524d 100644
--- a/view/frontend/web/js/model/aslowas.js
+++ b/view/frontend/web/js/model/aslowas.js
@@ -9,7 +9,6 @@ define([
     "mage/translate"
 ],
     function ($, $t) {
-        'use strict';
 
         var self;
         return {
@@ -32,14 +31,10 @@ define([
              */
             process: function(price, options) {
                 self = this;
-                var formatted, priceInt, optionsPrice;
-                formatted = Number(price.replace(/[^0-9\.]+/g,""));
+                var priceInt, optionsPrice;
 
-                if (options.currency_rate) {
-                    formatted = formatted / options.currency_rate;
-                    formatted = formatted.toFixed(2);
-                }
-                priceInt = formatted * 100;
+                // Format price to cents
+                priceInt = this.formatToPriceInt(price);
 
                 if (options) {
                     self.options = options;
@@ -63,6 +58,21 @@ define([
                 }
             },
 
+            /**
+             * Helper function to format price to amount integer
+             */
+             formatToPriceInt: function (price) {
+                var formatted, priceStr;
+
+                priceStr = price.replace(/^(-)|[^0-9.,]+/g, '$1').trim();
+                var result = priceStr.replace(/[^0-9]/g, '');
+                if (/[,\.]\d{2}$/.test(priceStr)) {
+                    result = result.replace(/(\d{2})$/, '.$1'); // restore decimal point
+                }
+                formatted = parseFloat(result);
+                return formatted.toFixed(2) * 100;
+            },
+
             /**
              * Hide As Low As
              */
@@ -131,39 +141,47 @@ define([
              * @private
              */
             loadScript: function(options) {
-                "use strict";
                 var pubKey = options.public_api_key,
                     script = options.script,
-                    _affirm_config = {
-                        public_api_key: pubKey, /* Use the PUBLIC API KEY Affirm sent you. */
-                        script: script
-                    };
-                (function(l, g, m, e, a, f, b) {
-                    var d, c = l[m] || {},
-                        h = document.createElement(f),
-                        n = document.getElementsByTagName(f)[0],
-                        k = function(a, b, c) {
-                            return function() {
-                                a[b]._.push([c, arguments])
-                            }
+                    locale = options.locale,
+                    countryCode = options.country_code
+
+                _affirm_config = {
+                    public_api_key: pubKey, /* Use the PUBLIC API KEY Affirm sent you. */
+                    script: script,
+                    locale: locale,
+                    country_code: countryCode,
+                };
+                (function (m, g, n, d, a, e, h, c) {
+                    var b = m[n] || {},
+                        k = document.createElement(e),
+                        p = document.getElementsByTagName(e)[0],
+                        l = function (a, b, c) {
+                            return function () {
+                                a[b]._.push([c, arguments]);
+                            };
                         };
-                    c[e] = k(c, e, "set");
-                    d = c[e];
-                    c[a] = {};
-                    c[a]._ = [];
-                    d._ = [];
-                    c[a][b] = k(c, a, b);
+                    b[d] = l(b, d, "set");
+                    var f = b[d];
+                    b[a] = {};
+                    b[a]._ = [];
+                    f._ = [];
+                    b._ = [];
+                    b[a][h] = l(b, a, h);
+                    b[c] = function () {
+                        b._.push([h, arguments]);
+                    };
                     a = 0;
-                    for (b = "set add save post open empty reset on off trigger ready setProduct".split(" "); a < b.length; a++) d[b[a]] = k(c, e, b[a]);
+                    for (c = "set add save post open empty reset on off trigger ready setProduct".split(" "); a < c.length; a++) f[c[a]] = l(b, d, c[a]);
                     a = 0;
-                    for (b = ["get", "token", "url", "items"]; a < b.length; a++) d[b[a]] = function() {};
-                    h.async = !0;
-                    h.src = g[f];
-                    n.parentNode.insertBefore(h, n);
-                    delete g[f];
-                    d(g);
-                    l[m] = c
-                })(window, _affirm_config, "affirm", "checkout", "ui", "script", "ready");
+                    for (c = ["get", "token", "url", "items"]; a < c.length; a++) f[c[a]] = function () {};
+                    k.async = !0;
+                    k.src = g[e];
+                    p.parentNode.insertBefore(k, p);
+                    delete g[e];
+                    f(g);
+                    m[n] = b;
+                })(window, _affirm_config, "affirm", "checkout", "ui", "script", "ready", "jsReady");
             },
 
             /**
diff --git a/view/frontend/web/js/model/global.js b/view/frontend/web/js/model/global.js
index 20b4c612..0efcdcca 100644
--- a/view/frontend/web/js/model/global.js
+++ b/view/frontend/web/js/model/global.js
@@ -50,40 +50,46 @@ define([
              * @private
              */
             loadScript: function (options) {
-                "use strict";
                 var pubKey = options.public_api_key,
                     script = options.script,
-                    _affirm_config = {
-                        public_api_key: pubKey, /* Use the PUBLIC API KEY Affirm sent you. */
-                        script: script,
-                    };
-                (function (l, g, m, e, a, f, b) {
-                    var d, c = l[m] || {},
-                        h = document.createElement(f),
-                        n = document.getElementsByTagName(f)[0],
-                        k = function (a, b, c) {
+                    locale = options.locale,
+                    countryCode = options.country_code
+                _affirm_config = {
+                    public_api_key: pubKey, /* Use the PUBLIC API KEY Affirm sent you. */
+                    script: script,
+                    locale: locale,
+                    country_code: countryCode,
+                };
+                (function (m, g, n, d, a, e, h, c) {
+                    var b = m[n] || {},
+                        k = document.createElement(e),
+                        p = document.getElementsByTagName(e)[0],
+                        l = function (a, b, c) {
                             return function () {
-                                a[b]._.push([c, arguments])
-                            }
+                                a[b]._.push([c, arguments]);
+                            };
                         };
-                    c[e] = k(c, e, "set");
-                    d = c[e];
-                    c[a] = {};
-                    c[a]._ = [];
-                    d._ = [];
-                    c[a][b] = k(c, a, b);
+                    b[d] = l(b, d, "set");
+                    var f = b[d];
+                    b[a] = {};
+                    b[a]._ = [];
+                    f._ = [];
+                    b._ = [];
+                    b[a][h] = l(b, a, h);
+                    b[c] = function () {
+                        b._.push([h, arguments]);
+                    };
                     a = 0;
-                    for (b = "set add save post open empty reset on off trigger ready setProduct".split(" "); a < b.length; a++) d[b[a]] = k(c, e, b[a]);
+                    for (c = "set add save post open empty reset on off trigger ready setProduct".split(" "); a < c.length; a++) f[c[a]] = l(b, d, c[a]);
                     a = 0;
-                    for (b = ["get", "token", "url", "items"]; a < b.length; a++) d[b[a]] = function () {
-                    };
-                    h.async = !0;
-                    h.src = g[f];
-                    n.parentNode.insertBefore(h, n);
-                    delete g[f];
-                    d(g);
-                    l[m] = c
-                })(window, _affirm_config, "affirm", "checkout", "ui", "script", "ready");
+                    for (c = ["get", "token", "url", "items"]; a < c.length; a++) f[c[a]] = function () {};
+                    k.async = !0;
+                    k.src = g[e];
+                    p.parentNode.insertBefore(k, p);
+                    delete g[e];
+                    f(g);
+                    m[n] = b;
+                })(window, _affirm_config, "affirm", "checkout", "ui", "script", "ready", "jsReady");
             }
         }
     });