diff --git a/app/code/community/Ebizmarts/MailChimp/Block/Adminhtml/Sales/Order/Grid/Renderer/Abandoned.php b/app/code/community/Ebizmarts/MailChimp/Block/Adminhtml/Sales/Order/Grid/Renderer/Abandoned.php
new file mode 100644
index 000000000..197460308
--- /dev/null
+++ b/app/code/community/Ebizmarts/MailChimp/Block/Adminhtml/Sales/Order/Grid/Renderer/Abandoned.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * mc-magento Magento Component
+ *
+ * @category Ebizmarts
+ * @package mc-magento
+ * @author Ebizmarts Team <info@ebizmarts.com>
+ * @copyright Ebizmarts (http://ebizmarts.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ * @date: 7/7/16 1:31 PM
+ * @file: Abandoned.php
+ */
+class Ebizmarts_MailChimp_Block_Adminhtml_Sales_Order_Grid_Renderer_Abandoned  extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract
+{
+    public function render(Varien_Object $row)
+    {
+        $order = Mage::getModel('sales/order')->load($row->getData('entity_id'));
+        if($order->getMailchimpAbandonedcartFlag())
+        {
+            $result = '<img src="' . $this->getSkinUrl("mailchimp/images/logo-freddie-monocolor-200.png") . '" width="40" title="recovered cart by Mailchimp" />';
+        }
+        else {
+            $result = '';
+        }
+        return $result;
+    }
+}
\ No newline at end of file
diff --git a/app/code/community/Ebizmarts/MailChimp/Block/Adminhtml/System/Config/Account.php b/app/code/community/Ebizmarts/MailChimp/Block/Adminhtml/System/Config/Account.php
index fd23a0259..cc1105c5b 100755
--- a/app/code/community/Ebizmarts/MailChimp/Block/Adminhtml/System/Config/Account.php
+++ b/app/code/community/Ebizmarts/MailChimp/Block/Adminhtml/System/Config/Account.php
@@ -19,7 +19,7 @@ protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element)
         $html = '<ul class="checkboxes">';
 
         foreach ($values as $dat) {
-            if($dat['value'] == 6){
+            if($dat['value'] == 7){
                 $html .= "<li style='color:red;font-weight: bold;'>{$dat['label']}</li>";
             }else {
                 $html .= "<li>{$dat['label']}</li>";
diff --git a/app/code/community/Ebizmarts/MailChimp/Block/Adminhtml/System/Config/Date.php b/app/code/community/Ebizmarts/MailChimp/Block/Adminhtml/System/Config/Date.php
new file mode 100644
index 000000000..1ac7c6f51
--- /dev/null
+++ b/app/code/community/Ebizmarts/MailChimp/Block/Adminhtml/System/Config/Date.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * mc-magento Magento Component
+ *
+ * @category Ebizmarts
+ * @package mc-magento
+ * @author Ebizmarts Team <info@ebizmarts.com>
+ * @copyright Ebizmarts (http://ebizmarts.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ * @date: 7/5/16 2:19 PM
+ * @file: Date.php
+ */
+class Ebizmarts_MailChimp_Block_Adminhtml_System_Config_Date extends Mage_Adminhtml_Block_System_Config_Form_Field
+{
+    public function render(Varien_Data_Form_Element_Abstract $element)
+    {
+        $element->setFormat(Varien_Date::DATE_INTERNAL_FORMAT);
+        $element->setImage($this->getSkinUrl('images/grid-cal.gif'));
+        return parent::render($element);
+    }
+}
\ No newline at end of file
diff --git a/app/code/community/Ebizmarts/MailChimp/Block/Adminhtml/System/Config/Form/Field/Mapfields.php b/app/code/community/Ebizmarts/MailChimp/Block/Adminhtml/System/Config/Form/Field/Mapfields.php
new file mode 100755
index 000000000..8e18d2e88
--- /dev/null
+++ b/app/code/community/Ebizmarts/MailChimp/Block/Adminhtml/System/Config/Form/Field/Mapfields.php
@@ -0,0 +1,65 @@
+<?php
+
+/**
+ * MailChimp For Magento
+ *
+ * @category Ebizmarts_MailChimp
+ * @author Ebizmarts Team <info@ebizmarts.com>
+ * @copyright Ebizmarts (http://ebizmarts.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ * @date: 6/28/16 3:55 PM
+ * @file: Mapfields.php
+ */
+class Ebizmarts_MailChimp_Block_Adminhtml_System_Config_Form_Field_Mapfields extends Mage_Adminhtml_Block_System_Config_Form_Field_Array_Abstract
+{
+    protected $_customerAttributes;
+
+    public function __construct()
+    {
+        $this->addColumn('mailchimp', array(
+            'label' => Mage::helper('mailchimp')->__('MailChimp'),
+            'style' => 'width:120px',
+        ));
+        $this->addColumn('magento', array(
+            'label' => Mage::helper('mailchimp')->__('Customer'),
+            'style' => 'width:120px',
+        ));
+        $this->_addAfter = false;
+        $this->_addButtonLabel = Mage::helper('mailchimp')->__('Add new field');
+        parent::__construct();
+        $this->setTemplate('ebizmarts/mailchimp/system/config/form/field/array_dropdown.phtml');
+
+        $this->_customerAttributes = array();
+        $attrSetId = Mage::getResourceModel('eav/entity_attribute_collection')
+            ->setEntityTypeFilter(1)
+            ->addSetInfo()
+            ->getData();
+
+        foreach ($attrSetId as $option){
+            if($option['frontend_label']) {
+                $this->_customerAttributes[$option['attribute_id']] = $option['frontend_label'];
+            }
+        }
+        ksort($this->_customerAttributes);
+    }
+
+    protected function _renderCellTemplate($columnName)
+    {
+        if (empty($this->_columns[$columnName])) {
+            throw new Exception('Wrong column name specified.');
+        }
+        $column = $this->_columns[$columnName];
+        $inputName = $this->getElement()->getName() . '[#{_id}][' . $columnName . ']';
+
+        if ($columnName == 'magento') {
+            $rendered = '<select name="' . $inputName . '">';
+            foreach ($this->_customerAttributes as $att => $name) {
+                $rendered .= '<option value="' . $att . '">' . $name . '</option>';
+            }
+            $rendered .= '</select>';
+        } else {
+            return '<input type="text" name="' . $inputName . '" value="#{' . $columnName . '}" ' . ($column['size'] ? 'size="' . $column['size'] . '"' : '') . '/>';
+        }
+        return $rendered;
+    }
+}
\ No newline at end of file
diff --git a/app/code/community/Ebizmarts/MailChimp/Block/Adminhtml/System/Config/ResetList.php b/app/code/community/Ebizmarts/MailChimp/Block/Adminhtml/System/Config/ResetList.php
new file mode 100644
index 000000000..9211c5bbc
--- /dev/null
+++ b/app/code/community/Ebizmarts/MailChimp/Block/Adminhtml/System/Config/ResetList.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * mc-magento Magento Component
+ *
+ * @category Ebizmarts
+ * @package mc-magento
+ * @author Ebizmarts Team <info@ebizmarts.com>
+ * @copyright Ebizmarts (http://ebizmarts.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ * @date: 5/27/16 1:02 PM
+ * @file: ResetProducts.php
+ */
+class Ebizmarts_MailChimp_Block_Adminhtml_System_Config_ResetList
+    extends Mage_Adminhtml_Block_System_Config_Form_Field
+{
+    protected function _construct()
+    {
+        parent::_construct();
+        $this->setTemplate('ebizmarts/mailchimp/system/config/resetlist.phtml');
+    }
+
+    protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element)
+    {
+        return $this->_toHtml();
+    }
+
+    public function getButtonHtml()
+    {
+        $button = $this->getLayout()->createBlock('adminhtml/widget_button')
+            ->setData(array(
+                'id' => 'changelist_button',
+                'label' => $this->helper('mailchimp')->__('Change List'),
+                'onclick' => 'javascript:resetlist(); return false;',
+                'style' => 'display:none'
+            ));
+
+        return $button->toHtml();
+    }
+    public function getAjaxCheckUrl()
+    {
+        return Mage::helper('adminhtml')->getUrl('adminhtml/ecommerce/resetList');
+    }
+    public function getMessage()
+    {
+        return __(Mage::getStoreConfig(Ebizmarts_MailChimp_Model_Config::WARNING_MESSAGE));
+    }
+    public function getPopupMessage()
+    {
+        return __(Mage::getStoreConfig(Ebizmarts_MailChimp_Model_Config::POPUP_MESSAGE));
+    }
+
+}
\ No newline at end of file
diff --git a/app/code/community/Ebizmarts/MailChimp/Block/Popup/Emailcatcher.php b/app/code/community/Ebizmarts/MailChimp/Block/Popup/Emailcatcher.php
index cba9e5310..e62dfae3e 100755
--- a/app/code/community/Ebizmarts/MailChimp/Block/Popup/Emailcatcher.php
+++ b/app/code/community/Ebizmarts/MailChimp/Block/Popup/Emailcatcher.php
@@ -48,8 +48,12 @@ protected function _handleCookie(){
         $cookieValues = explode('/', $emailCookie);
         $email = $cookieValues[0];
         $email = str_replace(' ', '+', $email);
-        $fName = $cookieValues[1];
-        $lName = $cookieValues[2];
+        if(isset($cookieValues[1])) {
+            $fName = $cookieValues[1];
+        }
+        if(isset($cookieValues[2])) {
+            $lName = $cookieValues[2];
+        }
         if($subscribeCookie == 'true'){
             $subscriber = Mage::getModel('newsletter/subscriber')->loadByEmail($email);
             if(!$subscriber->getId()) {
diff --git a/app/code/community/Ebizmarts/MailChimp/Helper/Data.php b/app/code/community/Ebizmarts/MailChimp/Helper/Data.php
index 13b6c1749..a705b9886 100755
--- a/app/code/community/Ebizmarts/MailChimp/Helper/Data.php
+++ b/app/code/community/Ebizmarts/MailChimp/Helper/Data.php
@@ -19,7 +19,7 @@ class Ebizmarts_MailChimp_Helper_Data extends Mage_Core_Helper_Abstract
      * @param null $websiteId
      * @return array
      */
-    public function getConfigScopeId($storeId = null, $websiteId = null)
+    protected function _getConfigScopeId($storeId = null, $websiteId = null)
     {
         $scopeArray = array();
         if ($code = Mage::getSingleton('adminhtml/config_data')->getStore()) // store level
@@ -37,38 +37,41 @@ public function getConfigScopeId($storeId = null, $websiteId = null)
     }
 
     /**
-     * Get configuration value from back end and front end unless storeId is sent, in this last case it gets the configuration from the store Id sent
+     *  Get configuration value from back end and front end unless storeId is sent, in this last case it gets the configuration from the store Id sent
      *
      * @param $path
-     * @param null $storeId  If this is null it gets the config for the current store (works for back end and front end)
+     * @param null $storeId If this is null it gets the config for the current store (works for back end and front end)
+     * @param bool $returnParentValueIfNull
      * @return mixed|null
+     * @throws Mage_Core_Exception
      */
-    public function getConfigValue($path, $storeId = null)
+    public function getConfigValue($path, $storeId = null, $returnParentValueIfNull = false)
     {
         $scopeArray = array();
+        $configValue = null;
 
         //Get store scope for back end or front end
         if(!$storeId) {
-            $scopeArray = $this->getConfigScopeId();
-
+            $scopeArray = $this->_getConfigScopeId();
         }else{
             $scopeArray['storeId'] = $storeId;
         }
-        $configValue = null;
-        if (isset($scopeArray['websiteId']) && $scopeArray['websiteId']) {
-            //Website scope
-            if (Mage::app()->getWebsite($scopeArray['websiteId'])->getConfig($path)) {
-                $configValue = Mage::app()->getWebsite($scopeArray['websiteId'])->getConfig($path);
-            }
-        } elseif (isset($scopeArray['storeId']) && $scopeArray['storeId']) {
-            //Store view scope
-            if (Mage::getStoreConfig($path, $scopeArray['storeId'])) {
-                $configValue = Mage::getStoreConfig($path, $scopeArray['storeId']);
-            }
-        } else {
-            //Default config scope
-            if (Mage::getStoreConfig($path)) {
-                $configValue = Mage::getStoreConfig($path);
+        if(!$returnParentValueIfNull) {
+            if (isset($scopeArray['websiteId']) && $scopeArray['websiteId']) {
+                //Website scope
+                if (Mage::app()->getWebsite($scopeArray['websiteId'])->getConfig($path) !== null) {
+                    $configValue = Mage::app()->getWebsite($scopeArray['websiteId'])->getConfig($path);
+                }
+            } elseif (isset($scopeArray['storeId']) && $scopeArray['storeId']) {
+                //Store view scope
+                if (Mage::getStoreConfig($path, $scopeArray['storeId']) !== null) {
+                    $configValue = Mage::getStoreConfig($path, $scopeArray['storeId']);
+                }
+            } else {
+                //Default config scope
+                if (Mage::getStoreConfig($path) !== null) {
+                    $configValue = Mage::getStoreConfig($path);
+                }
             }
         }
         return $configValue;
@@ -110,27 +113,38 @@ public function getMCMinSyncDateFlag()
     public function resetMCEcommerceData($deleteDataInMailchimp=false)
     {
         $ecommerceEnabled = Mage::helper('mailchimp')->getConfigValue(Ebizmarts_MailChimp_Model_Config::ECOMMERCE_ACTIVE);
+        $apikey = Mage::helper('mailchimp')->getConfigValue(Ebizmarts_MailChimp_Model_Config::GENERAL_APIKEY);
+        $listId = Mage::helper('mailchimp')->getConfigValue(Ebizmarts_MailChimp_Model_Config::GENERAL_LIST);
         //delete store id and data from mailchimp
         if($deleteDataInMailchimp && $this->getMCStoreId() && $this->getMCStoreId() != "")
         {
-            Mage::getModel('mailchimp/api_stores')->deleteStore($this->getMCStoreId());
+            try {
+                Mage::getModel('mailchimp/api_stores')->deleteStore($this->getMCStoreId());
+            } catch(Mailchimp_Error $e)
+            {
+
+            }
             //clear store config values
-            Mage::getConfig()->saveConfig(Ebizmarts_MailChimp_Model_Config::GENERAL_MCSTOREID, null);
+            Mage::getConfig()->deleteConfig(Ebizmarts_MailChimp_Model_Config::GENERAL_MCSTOREID);
         }
-        if($ecommerceEnabled) {
+        if($ecommerceEnabled&&$apikey&&$listId) {
             //generate store id
             $date = date('Y-m-d-His');
             $store_id = parse_url(Mage::getBaseUrl(), PHP_URL_HOST) . '_' . $date;
 
             //create store in mailchimp
-            Mage::getModel('mailchimp/api_stores')->createMailChimpStore($store_id);
+            try {
+                Mage::getModel('mailchimp/api_stores')->createMailChimpStore($store_id);
+                //save in config
+                Mage::getConfig()->saveConfig(Ebizmarts_MailChimp_Model_Config::GENERAL_MCSTOREID, $store_id);
+            } catch(Exception $e) {
+                Mage::getSingleton('adminhtml/session')->addError($e->getMessage());
+            }
 
-            //save in config
-            Mage::getConfig()->saveConfig(Ebizmarts_MailChimp_Model_Config::GENERAL_MCSTOREID, $store_id);
         }
         //reset mailchimp minimum date to sync flag
         Mage::getConfig()->saveConfig(Ebizmarts_MailChimp_Model_Config::GENERAL_MCMINSYNCDATEFLAG, Varien_Date::now());
-            Mage::getConfig()->cleanCache();
+        Mage::getConfig()->cleanCache();
     }
 
     /**
@@ -148,6 +162,11 @@ public function isEcomSyncDataEnabled()
         return $ret;
     }
 
+    /**
+     * Save error response from MailChimp's API in "MailChimp_Error.log" file.
+     * 
+     * @param $message
+     */
     public function logError($message)
     {
         if($this->getConfigValue(Ebizmarts_MailChimp_Model_Config::GENERAL_LOG)) {
@@ -155,6 +174,11 @@ public function logError($message)
         }
     }
 
+    /**
+     * Save request made to MailChimp's API in "MailChimp_Requests.log" file.
+     * 
+     * @param $message
+     */
     public function logRequest($message)
     {
         if($this->getConfigValue(Ebizmarts_MailChimp_Model_Config::GENERAL_LOG)) {
@@ -162,6 +186,9 @@ public function logRequest($message)
         }
     }
 
+    /**
+     * @return string
+     */
     public function getWebhooksKey()
     {
         $crypt = md5((string)Mage::getConfig()->getNode('global/crypt/key'));
@@ -169,6 +196,10 @@ public function getWebhooksKey()
 
         return $key;
     }
+
+    /**
+     * Reset error messages from Products, Subscribers, Customers, Orders, Quotes and set them to be sent again.
+     */
     public function resetErrors()
     {
         // reset products with errors
@@ -213,26 +244,53 @@ public function resetErrors()
         // reset quotes with errors
         $resource = Mage::getResourceModel('sales/quote');
         $connection->update($resource->getMainTable(),array('mailchimp_sync_error'=>'','mailchimp_sync_delta'=>'0000-00-00 00:00:00'),"mailchimp_sync_error <> ''");
-        $resource = Mage::getResourceModel('mailchimp/mailchimperrors');
-        $connection->query('TRUNCATE TABLE '.$resource->getMainTable());
+        $errorCollection = Mage::getModel('mailchimp/mailchimperrors')->getCollection();
+        foreach($errorCollection as $item)
+        {
+            $item->delete();
+        }
     }
 
-    /**
-     * Get status to send confirmation if Need to Confirm enabled on Magento
-     *
-     * @param null $subscriber
-     * @return string
-     */
-    public function getStatus($subscriber = null)
+    public function resetCampaign()
     {
-        if($this->getConfigValue(Mage_Newsletter_Model_Subscriber::XML_PATH_CONFIRMATION_FLAG) && (!$subscriber || $subscriber->getStatus() != 'subscribed'))
+        $orderCollection = Mage::getModel('sales/order')->getCollection()
+            ->addFieldToFilter('mailchimp_campaign_id',array(
+                array('neq'=>0)))
+            ->addFieldToFilter('mailchimp_campaign_id',array(
+                array('notnull'=>true)
+            ));
+        foreach($orderCollection as $order)
         {
-            $status = 'pending';
+            $order->setMailchimpCampaignId(0);
+            $order->save();
         }
-        else
-        {
-            $status = 'subscribed';
+    }
+    public function createStore($listId)
+    {
+        if($listId) {
+            //generate store id
+            $date = date('Y-m-d-His');
+            $store_id = parse_url(Mage::getBaseUrl(), PHP_URL_HOST) . '_' . $date;
+            //create store in mailchimp
+            try {
+                Mage::getModel('mailchimp/api_stores')->createMailChimpStore($store_id,$listId);
+                //save in config
+                Mage::getConfig()->saveConfig(Ebizmarts_MailChimp_Model_Config::GENERAL_MCSTOREID, $store_id);
+            } catch (Exception $e) {
+                Mage::getSingleton('adminhtml/session')->addError($e->getMessage());
+            }
+        }
+    }
+    public function deleteStore()
+    {
+        $MCStoreId = $this->getMCStoreId();
+        if(!empty($MCStoreId)) {
+            try {
+                Mage::getModel('mailchimp/api_stores')->deleteStore($MCStoreId);
+            } catch (Mailchimp_Error $e) {
+            }
+            //clear store config values
+            Mage::getConfig()->deleteConfig(Ebizmarts_MailChimp_Model_Config::GENERAL_MCSTOREID);
         }
-        return $status;
     }
 }
diff --git a/app/code/community/Ebizmarts/MailChimp/Model/Api/Batches.php b/app/code/community/Ebizmarts/MailChimp/Model/Api/Batches.php
index cbf3d7dc1..957032197 100644
--- a/app/code/community/Ebizmarts/MailChimp/Model/Api/Batches.php
+++ b/app/code/community/Ebizmarts/MailChimp/Model/Api/Batches.php
@@ -12,29 +12,98 @@
 
 class Ebizmarts_MailChimp_Model_Api_Batches
 {
+    /**
+     * Get Results and send Ecommerce Batches.
+     */
+    public function handleEcommerceBatches(){
+        $mailchimpStoreId = Mage::helper('mailchimp')->getMCStoreId();
+        $this->_getResults($mailchimpStoreId, true);
+        $this->_updateCustomerOrderData($mailchimpStoreId);
+        $this->_sendEcommerceBatch($mailchimpStoreId);
+    }
+
+    /**
+     * Get Results and send Subscriber Batches.
+     */
+    public function handleSubscriberBatches(){
+        $this->_sendSubscriberBatches();
+    }
 
-    public function getResults($storeId)
+    /**
+     * Get results of batch operations sent to MailChimp.
+     *
+     * @param $storeId
+     * @param bool $isMailChimpStoreId
+     */
+    protected function _getResults($storeId, $isMailChimpStoreId = false)
     {
         $collection = Mage::getModel('mailchimp/synchbatches')->getCollection()
             ->addFieldToFilter('store_id', array('eq' => $storeId))
             ->addFieldToFilter('status', array('eq' => 'pending'));
         foreach ($collection as $item) {
-            $files = $this->getBatchResponse($item->getBatchId(), $storeId);
-            if (count($files)) {
-                $this->processEachResponseFile($files);
-                $item->setStatus('completed');
-                $item->save();
-            }
-            $baseDir = Mage::getBaseDir();
-            if (is_dir($baseDir . DS . 'var' . DS . 'mailchimp' . DS . $item->getBatchId())) {
-                rmdir($baseDir . DS . 'var' . DS . 'mailchimp' . DS . $item->getBatchId());
+            try {
+                $storeId = ($isMailChimpStoreId) ? 0 : $storeId;
+                $files = $this->getBatchResponse($item->getBatchId(), $storeId);
+                if (count($files)) {
+                    $this->processEachResponseFile($files);
+                    $item->setStatus('completed');
+                    $item->save();
+                }
+                $baseDir = Mage::getBaseDir();
+                if (is_dir($baseDir . DS . 'var' . DS . 'mailchimp' . DS . $item->getBatchId())) {
+                    rmdir($baseDir . DS . 'var' . DS . 'mailchimp' . DS . $item->getBatchId());
+                }
+            } catch(Exception $e)
+            {
+                Mage::log("Error with a response: ".$e->getMessage());
             }
         }
     }
 
-    public function sendEcommerceBatch($mailchimpStoreId)
+    protected function _updateCustomerOrderData($mailchimpStoreId)
     {
+        if (Mage::helper('mailchimp')->getConfigValue(Ebizmarts_MailChimp_Model_Config::GENERAL_ACTIVE) && Mage::helper('mailchimp')->isEcomSyncDataEnabled()) {
+            $batchArray = array();
+
+            //customer operations
+            $customerArray = Mage::getModel('mailchimp/api_customers')->updateOrderData($mailchimpStoreId);
+            $batchArray['operations'] = $customerArray;
+            if (!empty($batchArray['operations'])) {
+                try {
+                    $batchJson = json_encode($batchArray);
+                    if (!$batchJson || $batchJson == '') {
+                        Mage::helper('mailchimp')->logRequest('An empty operation was detected');
+                    } else {
+                        //log request
+                        Mage::helper('mailchimp')->logRequest($batchJson);
+
+                        $apiKey = Mage::helper('mailchimp')->getConfigValue(Ebizmarts_MailChimp_Model_Config::GENERAL_APIKEY);
+                        $mailchimpApi = new Ebizmarts_Mailchimp($apiKey,null,'Mailchimp4Magento'.(string)Mage::getConfig()->getNode('modules/Ebizmarts_MailChimp/version'));
+                        $batchResponse = $mailchimpApi->batchOperation->add($batchJson);
+
+                        //save batch id to db
+                        $batch = Mage::getModel('mailchimp/synchbatches');
+                        $batch->setStoreId($mailchimpStoreId)
+                            ->setBatchId($batchResponse['id'])
+                            ->setStatus($batchResponse['status']);
+                        $batch->save();
+                        return $batchResponse;
+                    }
+                } catch(Exception $e) {
+                    Mage::log("Jsonenconde fails");
+                }
+            }
+        }
+    }
 
+    /**
+     * Send Customers, Products, Orders, Carts to MailChimp store.
+     *
+     * @param $mailchimpStoreId
+     * @return mixed|null
+     */
+    public function _sendEcommerceBatch($mailchimpStoreId)
+    {
         try {
 
         if (Mage::helper('mailchimp')->getConfigValue(Ebizmarts_MailChimp_Model_Config::GENERAL_ACTIVE) && Mage::helper('mailchimp')->isEcomSyncDataEnabled()) {
@@ -42,40 +111,46 @@ public function sendEcommerceBatch($mailchimpStoreId)
             $apiKey = Mage::helper('mailchimp')->getConfigValue(Ebizmarts_MailChimp_Model_Config::GENERAL_APIKEY);
 
             $batchArray = array();
-            $ordersArray = array();
 
             //customer operations
             $customersArray = Mage::getModel('mailchimp/api_customers')->createBatchJson($mailchimpStoreId);
-
+            $batchArray['operations'] = $customersArray;
             //product operations
             $productsArray = Mage::getModel('mailchimp/api_products')->createBatchJson($mailchimpStoreId);
-
+            $batchArray['operations'] = array_merge($batchArray['operations'],$productsArray);
             if (empty($productsArray)) {
                 //order operations
+                $cartsArray = Mage::getModel('mailchimp/api_carts')->createBatchJson($mailchimpStoreId);
+                $batchArray['operations'] = array_merge($batchArray['operations'],$cartsArray);
                 $ordersArray = Mage::getModel('mailchimp/api_orders')->createBatchJson($mailchimpStoreId);
+                $batchArray['operations'] = array_merge($batchArray['operations'],$ordersArray);
+                if(empty($ordersArray)){
+                    $ordersCanceledArray = Mage::getModel('mailchimp/api_orders')->createCanceledBatchJson($mailchimpStoreId);
+                    $batchArray['operations'] = array_merge($batchArray['operations'],$ordersCanceledArray);
+                }
             }
-            $batchArray['operations'] = array_merge($customersArray,$productsArray,$ordersArray);
-
             if (!empty($batchArray['operations'])) {
-                $batchJson = json_encode($batchArray);
-                if(!$batchJson || $batchJson=='' )
-                {
-                    Mage::helper('mailchimp')->logRequest('An empty operation was detected');
-                }
-                else {
-                    //log request
-                    Mage::helper('mailchimp')->logRequest($batchJson);
+                try {
+                    $batchJson = json_encode($batchArray);
+                    if (!$batchJson || $batchJson == '') {
+                        Mage::helper('mailchimp')->logRequest('An empty operation was detected');
+                    } else {
+                        //log request
+                        Mage::helper('mailchimp')->logRequest($batchJson);
 
-                    $mailchimpApi = new Ebizmarts_Mailchimp($apiKey);
-                    $batchResponse = $mailchimpApi->batchOperation->add($batchJson);
+                        $mailchimpApi = new Ebizmarts_Mailchimp($apiKey,null,'Mailchimp4Magento'.(string)Mage::getConfig()->getNode('modules/Ebizmarts_MailChimp/version'));
+                        $batchResponse = $mailchimpApi->batchOperation->add($batchJson);
 
-                    //save batch id to db
-                    $batch = Mage::getModel('mailchimp/synchbatches');
-                    $batch->setStoreId($mailchimpStoreId)
-                        ->setBatchId($batchResponse['id'])
-                        ->setStatus($batchResponse['status']);
-                    $batch->save();
-                    return $batchResponse;
+                        //save batch id to db
+                        $batch = Mage::getModel('mailchimp/synchbatches');
+                        $batch->setStoreId($mailchimpStoreId)
+                            ->setBatchId($batchResponse['id'])
+                            ->setStatus($batchResponse['status']);
+                        $batch->save();
+                        return $batchResponse;
+                    }
+                } catch(Exception $e) {
+                    Mage::log("Jsonenconde fails");
                 }
             }
         }
@@ -91,50 +166,79 @@ public function sendEcommerceBatch($mailchimpStoreId)
         return null;
     }
 
-    public function sendSubscriberBatch($storeId, $limit)
+    /**
+     * Send Subscribers batch on each store view, return array of batches responses.
+     *
+     * @return array
+     */
+    protected function _sendSubscriberBatches(){
+        $subscriberLimit = Ebizmarts_MailChimp_Model_Api_subscribers::BATCH_LIMIT;
+        $stores = Mage::app()->getStores();
+        $batchResponses = array();
+        foreach($stores as $store) {
+            $storeId = $store->getId();
+            $this->_getResults($storeId, false);
+            if($subscriberLimit > 0) {
+                list($batchResponses[], $subscriberLimit) = $this->sendStoreSubscriberBatch($storeId, $subscriberLimit);
+            }else{
+                break;
+            }
+        }
+        return $batchResponses;
+    }
+
+    /**
+     * Send Subscribers batch on particular store view, return batch response.
+     *
+     * @param $storeId
+     * @param $limit
+     * @return array|null
+     */
+    public function sendStoreSubscriberBatch($storeId, $limit)
     {
-            try {
-                if (Mage::helper('mailchimp')->getConfigValue(Ebizmarts_MailChimp_Model_Config::GENERAL_ACTIVE, $storeId)) {
+        try {
+            $subscribersArray = array();
+            if (Mage::helper('mailchimp')->getConfigValue(Ebizmarts_MailChimp_Model_Config::GENERAL_ACTIVE, $storeId)) {
 
-                    $apiKey = Mage::helper('mailchimp')->getConfigValue(Ebizmarts_MailChimp_Model_Config::GENERAL_APIKEY, $storeId);
-                    $listId = Mage::helper('mailchimp')->getConfigValue(Ebizmarts_MailChimp_Model_Config::GENERAL_LIST, $storeId);
+                $apiKey = Mage::helper('mailchimp')->getConfigValue(Ebizmarts_MailChimp_Model_Config::GENERAL_APIKEY, $storeId);
+                $listId = Mage::helper('mailchimp')->getConfigValue(Ebizmarts_MailChimp_Model_Config::GENERAL_LIST, $storeId);
 
-                    $batchArray = array();
+                $batchArray = array();
 
-                    //subscriber operations
-                    $subscribersArray = Mage::getModel('mailchimp/api_subscribers')->createBatchJson($listId, $storeId, $limit);
-                    $limit -= count($subscribersArray);
-                }
+                //subscriber operations
+                $subscribersArray = Mage::getModel('mailchimp/api_subscribers')->createBatchJson($listId, $storeId, $limit);
+                $limit -= count($subscribersArray);
+            }
 
-                $batchArray['operations'] = $subscribersArray;
+            $batchArray['operations'] = $subscribersArray;
 
-                if (!empty($batchArray['operations'])) {
-                    $batchJson = json_encode($batchArray);
-                    if (!$batchJson || $batchJson == '') {
-                        Mage::helper('mailchimp')->logRequest('An empty operation was detected');
-                    } else {
-                        //log request
-                        Mage::helper('mailchimp')->logRequest($batchJson);
+            if (!empty($batchArray['operations'])) {
+                $batchJson = json_encode($batchArray);
+                if (!$batchJson || $batchJson == '') {
+                    Mage::helper('mailchimp')->logRequest('An empty operation was detected');
+                } else {
+                    //log request
+                    Mage::helper('mailchimp')->logRequest($batchJson);
 
-                        $mailchimpApi = new Ebizmarts_Mailchimp($apiKey);
+                        $mailchimpApi = new Ebizmarts_Mailchimp($apiKey,null,'Mailchimp4Magento'.(string)Mage::getConfig()->getNode('modules/Ebizmarts_MailChimp/version'));
                         $batchResponse = $mailchimpApi->batchOperation->add($batchJson);
 
-                        //save batch id to db
-                        $batch = Mage::getModel('mailchimp/synchbatches');
-                        $batch->setStoreId($storeId)
-                            ->setBatchId($batchResponse['id'])
-                            ->setStatus($batchResponse['status']);
-                        $batch->save();
-                        return array($batchResponse, $limit);
-                    }
+                    //save batch id to db
+                    $batch = Mage::getModel('mailchimp/synchbatches');
+                    $batch->setStoreId($storeId)
+                        ->setBatchId($batchResponse['id'])
+                        ->setStatus($batchResponse['status']);
+                    $batch->save();
+                    return array($batchResponse, $limit);
                 }
-            } catch
-            (Mailchimp_Error $e) {
-                Mage::helper('mailchimp')->logError($e->getFriendlyMessage());
-
-            } catch (Exception $e) {
-                Mage::helper('mailchimp')->logError($e->getMessage());
             }
+        } catch
+        (Mailchimp_Error $e) {
+            Mage::helper('mailchimp')->logError($e->getFriendlyMessage());
+
+        } catch (Exception $e) {
+            Mage::helper('mailchimp')->logError($e->getMessage());
+        }
         return null;
     }
 
@@ -143,15 +247,24 @@ public function sendSubscriberBatch($storeId, $limit)
      * @param $storeId
      * @return array
      */
-    protected function getBatchResponse($batchId, $storeId)
+    protected function getBatchResponse($batchId, $storeId = 0)
     {
         $files = array();
         $baseDir = Mage::getBaseDir();
-        $apiKey = Mage::helper('mailchimp')->getConfigValue(Ebizmarts_MailChimp_Model_Config::GENERAL_APIKEY);
-        $api = new Ebizmarts_Mailchimp($apiKey);
+        $apiKey = Mage::helper('mailchimp')->getConfigValue(Ebizmarts_MailChimp_Model_Config::GENERAL_APIKEY, $storeId);
+        $api = new Ebizmarts_Mailchimp($apiKey,null,'Mailchimp4Magento'.(string)Mage::getConfig()->getNode('modules/Ebizmarts_MailChimp/version'));
+        $response = array();
         // check the status of the job
-        $response = $api->batchOperation->status($batchId);
-        if ($response['status'] == 'finished') {
+        try {
+            $response = $api->batchOperation->status($batchId);
+        } catch
+        (Mailchimp_Error $e) {
+            Mage::helper('mailchimp')->logError($e->getFriendlyMessage());
+
+        } catch (Exception $e) {
+            Mage::helper('mailchimp')->logError($e->getMessage());
+        }
+        if (isset($response['status']) && $response['status'] == 'finished') {
             // get the tar.gz file with the results
             $fileUrl = urldecode($response['response_body_url']);
             $fileName = $baseDir . DS . 'var' . DS . 'mailchimp' . DS . $batchId;
@@ -219,23 +332,43 @@ protected function processEachResponseFile($files)
                     switch ($type) {
                         case Ebizmarts_MailChimp_Model_Config::IS_PRODUCT:
                             $p = Mage::getModel('catalog/product')->load($id);
-                            $p->setData("mailchimp_sync_error", $error);
-                            $p->save();
+                            if($p->getId()==$id) {
+                                $p->setData("mailchimp_sync_error", $error);
+                                $p->save();
+                            }
+                            else {
+                                Mage::helper('mailchimp')->logError("Error: product ".$id." not found");
+                            }
                             break;
                         case Ebizmarts_MailChimp_Model_Config::IS_CUSTOMER:
                             $c = Mage::getModel('customer/customer')->load($id);
-                            $c->setData("mailchimp_sync_error", $error);
-                            $c->save();
+                            if($c->getId()==$id) {
+                                $c->setData("mailchimp_sync_error", $error);
+                                $c->save();
+                            }
+                            else {
+                                Mage::helper('mailchimp')->logError("Error: customer ".$id." not found");
+                            }
                             break;
                         case Ebizmarts_MailChimp_Model_Config::IS_ORDER:
                             $o = Mage::getModel('sales/order')->load($id);
-                            $o->setData("mailchimp_sync_error", $error);
-                            $o->save();
+                            if($o->getId()==$id) {
+                                $o->setData("mailchimp_sync_error", $error);
+                                $o->save();
+                            }
+                            else {
+                                Mage::helper('mailchimp')->logError("Error: order ".$id." not found");
+                            }
                             break;
                         case Ebizmarts_MailChimp_Model_Config::IS_QUOTE:
                             $q = Mage::getModel('sales/quote')->load($id);
-                            $q->setData("mailchimp_sync_error", $error);
-                            $q->save();
+                            if($q->getId()==$id) {
+                                $q->setData("mailchimp_sync_error", $error);
+                                $q->save();
+                            }
+                            else {
+                                Mage::helper('mailchimp')->logError("Error: quote ".$id." not found");
+                            }
                             break;
                         default:
                             Mage::helper('mailchimp')->logError("Error: no identification ".$type." found");
diff --git a/app/code/community/Ebizmarts/MailChimp/Model/Api/Carts.php b/app/code/community/Ebizmarts/MailChimp/Model/Api/Carts.php
index 5129779e9..ecac10c67 100644
--- a/app/code/community/Ebizmarts/MailChimp/Model/Api/Carts.php
+++ b/app/code/community/Ebizmarts/MailChimp/Model/Api/Carts.php
@@ -12,11 +12,380 @@
 class Ebizmarts_MailChimp_Model_Api_Carts
 {
 
-    const BATCH_LIMIT = 1000;
+    const BATCH_LIMIT = 100;
+
+    protected $firstDate;
+    protected $counter;
+    protected $batchId;
+    protected $api = null;
+
+    /**
+     * @param $mailchimpStoreId
+     * @return array
+     */
+    public function createBatchJson($mailchimpStoreId)
+    {
+        $allCarts = array();
+        if(!Mage::getConfig(Ebizmarts_MailChimp_Model_Config::ABANDONEDCART_ACTIVE))
+        {
+            return $allCarts;
+        }
+        $this->firstDate = Mage::getStoreConfig(Ebizmarts_MailChimp_Model_Config::ABANDONEDCART_FIRSTDATE);
+        $this->counter = 0;
+        $this->batchId = Ebizmarts_MailChimp_Model_Config::IS_QUOTE.'_'.date('Y-m-d-H-i-s');
+        // get all the carts converted in orders (must be deleted on mailchimp)
+        $allCarts = array_merge($allCarts,$this->_getConvertedQuotes($mailchimpStoreId));
+        // get all the carts modified but not converted in orders
+        $allCarts = array_merge($allCarts,$this->_getModifiedQuotes($mailchimpStoreId));
+        // get new carts
+        $allCarts = array_merge($allCarts,$this->_getNewQuotes($mailchimpStoreId));
+        return $allCarts;
+    }
+
+    /**
+     * @param $mailchimpStoreId
+     * @return array
+     */
+    protected function _getConvertedQuotes($mailchimpStoreId)
+    {
+        $allCarts = array();
+        $convertedCarts = Mage::getModel('sales/quote')->getCollection();
+        // get only the converted quotes
+        $convertedCarts->addFieldToFilter('is_active',array('eq'=>0));
+        // be sure that the quote are already in mailchimp
+        $convertedCarts->addFieldToFilter('mailchimp_sync_delta',array(
+            array('neq' => '0000-00-00 00:00:00'),
+            array('null',false)
+        ));
+        // and not deleted
+        $convertedCarts->addFieldToFilter('mailchimp_deleted',array('eq'=>0));
+        $convertedCarts->addFieldToFilter('created_at',array('from'=>$this->firstDate));
+        // limit the collection
+        $convertedCarts->getSelect()->limit(self::BATCH_LIMIT);
+        foreach($convertedCarts as $cart)
+        {
+                // we need to delete all the carts associated with this email
+            $allCartsForEmail = $this->_getAllCartsByEmail($cart->getCustomerEmail());
+            foreach($allCartsForEmail as $cartForEmail)
+            {
+                $allCarts[$this->counter]['method'] = 'DELETE';
+                $allCarts[$this->counter]['path'] = '/ecommerce/stores/' . $mailchimpStoreId . '/carts/' . $cartForEmail->getEntityId();
+                $allCarts[$this->counter]['operation_id'] = $this->batchId . '_' . $cartForEmail->getEntityId();
+                $allCarts[$this->counter]['body'] = '';
+                $cartForEmail->setData("mailchimp_sync_delta", Varien_Date::now());
+                $cartForEmail->setMailchimpDeleted(1);
+                $cartForEmail->save();
+                $this->counter += 1;
+            }
+            $allCartsForEmail->clear();
+            $allCarts[$this->counter]['method'] = 'DELETE';
+            $allCarts[$this->counter]['path'] = '/ecommerce/stores/' . $mailchimpStoreId . '/carts/' . $cart->getEntityId();
+            $allCarts[$this->counter]['operation_id'] = $this->batchId . '_' . $cart->getEntityId();
+            $allCarts[$this->counter]['body'] = '';
+            $cart->setData("mailchimp_sync_delta", Varien_Date::now());
+            $cart->setMailchimpDeleted(1);
+            $cart->save();
+            $this->counter += 1;
+        }
+        return $allCarts;
+    }
+
+    /**
+     * @param $mailchimpStoreId
+     * @return array
+     */
+    protected function _getModifiedQuotes($mailchimpStoreId)
+    {
+        $allCarts = array();
+        $modifiedCarts = Mage::getModel('sales/quote')->getCollection();
+        // select carts with no orders
+        $modifiedCarts->addFieldToFilter('is_active',array('eq'=>1));
+        // select carts already sent to mailchimp and moodifief after
+        $modifiedCarts->addFieldToFilter('mailchimp_sync_delta',array(
+            array('neq' => '0000-00-00 00:00:00'),
+            array('null',false)
+        ));
+        $modifiedCarts->addFieldToFilter('mailchimp_sync_delta',array('lt'=>new Zend_Db_Expr('updated_at')));
+        // and not deleted in mailchimp
+        $modifiedCarts->addFieldToFilter('mailchimp_deleted',array('eq'=>0));
+        $modifiedCarts->getSelect()->limit(self::BATCH_LIMIT);
+        foreach($modifiedCarts as $cart)
+        {
+            $allCarts[$this->counter]['method'] = 'DELETE';
+            $allCarts[$this->counter]['path'] = '/ecommerce/stores/' . $mailchimpStoreId . '/carts/' . $cart->getEntityId();
+            $allCarts[$this->counter]['operation_id'] = $this->batchId . '_' . $cart->getEntityId();
+            $allCarts[$this->counter]['body'] = '';
+            $this->counter += 1;
+            $customer = Mage::getModel("customer/customer");
+            $customer->setWebsiteId(Mage::getModel('core/store')->load($cart->getStoreId())->getWebsiteId());
+            $customer->loadByEmail($cart->getCustomerEmail());
+            if($customer->getEmail()!=$cart->getCustomerEmail()) {
+                $allCartsForEmail = $this->_getAllCartsByEmail($cart->getCustomerEmail());
+                foreach ($allCartsForEmail as $cartForEmail) {
+                    $allCarts[$this->counter]['method'] = 'DELETE';
+                    $allCarts[$this->counter]['path'] = '/ecommerce/stores/' . $mailchimpStoreId . '/carts/' . $cartForEmail->getEntityId();
+                    $allCarts[$this->counter]['operation_id'] = $this->batchId . '_' . $cartForEmail->getEntityId();
+                    $allCarts[$this->counter]['body'] = '';
+                    $cartForEmail->setData("mailchimp_sync_delta", Varien_Date::now());
+                    $cartForEmail->setMailchimpDeleted(1);
+                    $cartForEmail->save();
+                    $this->counter += 1;
+                }
+                $allCartsForEmail->clear();
+            }
+            if(!$cart->getCustomerId()&&$customer->getEmail()==$cart->getCustomerEmail())
+            {
+                continue;
+            }
+            if(count($cart->getAllVisibleItems())) {
+                $cartJson = $this->_makeCart($cart, $mailchimpStoreId);
+                $allCarts[$this->counter]['method'] = 'POST';
+                $allCarts[$this->counter]['path'] = '/ecommerce/stores/' . $mailchimpStoreId . '/carts';
+                $allCarts[$this->counter]['operation_id'] = $this->batchId . '_' . $cart->getEntityId();
+                $allCarts[$this->counter]['body'] = $cartJson;
+                $this->counter += 1;
+            }
+            $cart->setData("mailchimp_sync_delta", Varien_Date::now());
+            $cart->save();
+        }
+        return $allCarts;
+    }
+
+    /**
+     * @param $mailchimpStoreId
+     * @return array
+     */
+    protected function _getNewQuotes($mailchimpStoreId)
+    {
+        $allCarts = array();
+        $newCarts = Mage::getModel('sales/quote')->getCollection();
+        $newCarts->addFieldToFilter('is_active',array('eq'=>1))
+            ->addFieldToFilter('mailchimp_sync_delta',
+                array(
+                    array('eq'=>'0000-00-00 00:00:00'),
+                    array('null'=>true)
+                )
+            );
+        $newCarts->addFieldToFilter('created_at',array('from'=>$this->firstDate));
+        $newCarts->addFieldToFilter('customer_email',array('notnull'=>true));
+        $newCarts->addFieldToFilter('items_count',array('gt'=>0));
+        $newCarts->getSelect()->limit(self::BATCH_LIMIT);
+        foreach($newCarts as $cart)
+        {
+            if(!count($cart->getAllVisibleItems())) {
+                continue;
+            }
+            $customer = Mage::getModel("customer/customer");
+            $customer->setWebsiteId(Mage::getModel('core/store')->load($cart->getStoreId())->getWebsiteId());
+            $customer->loadByEmail($cart->getCustomerEmail());
+            if($customer->getEmail()!=$cart->getCustomerEmail()) {
+                $allCartsForEmail = $this->_getAllCartsByEmail($cart->getCustomerEmail());
+                foreach ($allCartsForEmail as $cartForEmail) {
+                    $allCarts[$this->counter]['method'] = 'DELETE';
+                    $allCarts[$this->counter]['path'] = '/ecommerce/stores/' . $mailchimpStoreId . '/carts/' . $cartForEmail->getEntityId();
+                    $allCarts[$this->counter]['operation_id'] = $this->batchId . '_' . $cartForEmail->getEntityId();
+                    $allCarts[$this->counter]['body'] = '';
+                    $cartForEmail->setData("mailchimp_sync_delta", Varien_Date::now());
+                    $cartForEmail->setMailchimpDeleted(1);
+                    $cartForEmail->save();
+                    $this->counter += 1;
+                }
+                $allCartsForEmail->clear();
+            }
+            if(!$cart->getCustomerId()&&$customer->getEmail()==$cart->getCustomerEmail())
+            {
+                continue;
+            }
+            $cartJson = $this->_makeCart($cart, $mailchimpStoreId);
+            $allCarts[$this->counter]['method'] = 'POST';
+            $allCarts[$this->counter]['path'] = '/ecommerce/stores/' . $mailchimpStoreId . '/carts';
+            $allCarts[$this->counter]['operation_id'] = $this->batchId . '_' . $cart->getEntityId();
+            $allCarts[$this->counter]['body'] = $cartJson;
+            $cart->setData("mailchimp_sync_delta", Varien_Date::now());
+            $cart->save();
+            $this->counter += 1;
+        }
+        return $allCarts;
+    }
 
     /**
-     * WE WONT BE SENDING ABANDONED CARTS WITH BATCHES BUT INDIVIDUALLY
      *
+     * @param $email
+     * @return object
+     */
+    protected function _getAllCartsByEmail($email)
+    {
+        $allCartsForEmail = Mage::getModel('sales/quote')->getCollection();
+        $allCartsForEmail->addFieldToFilter('is_active',array('eq'=>1));
+        $allCartsForEmail->addFieldToFilter('mailchimp_sync_delta',array(
+            array('neq' => '0000-00-00 00:00:00'),
+            array('null',false)
+        ));
+        $allCartsForEmail->addFieldToFilter('mailchimp_deleted',array('eq'=>0));
+        $allCartsForEmail->addFieldToFilter('customer_email',array('eq'=>$email));
+        return $allCartsForEmail;
+    }
+
+    /**
+     * @param $cart
+     * @param $mailchimpStoreId
+     * @return string
      */
+    protected function _makeCart($cart,$mailchimpStoreId)
+    {
+        $campaignId = $cart->getMailChimpCampaignId();
+        $oneCart = array();
+        $oneCart['id'] = $cart->getEntityId();
+        $oneCart['customer'] = $this->_getCustomer($cart,$mailchimpStoreId);
+        if($campaignId) {
+            $oneCart['campaign_id'] = $campaignId;
+        }
+        $oneCart['checkout_url'] = $this->_getCheckoutUrl($cart);
+        $oneCart['currency_code'] = $cart->getQuoteCurrencyCode();
+        $oneCart['order_total'] = $cart->getGrandTotal();
+        $oneCart['tax_total'] = 0;
+        $lines = array();
+        // get all items on the cart
+        $items = $cart->getAllVisibleItems();
+        $item_count = 0;
+        foreach($items as $item)
+        {
+            $line = array();
+            if($item->getProductType()==Mage_Catalog_Model_Product_Type::TYPE_CONFIGURABLE) {
+                $options = $item->getProductOptions();
+                $sku = $options['simple_sku'];
+                $variant = Mage::getModel('catalog/product')->getIdBySku($sku);
+            }
+            else {
+                $variant = $item->getProductId();
+            }
+
+            $line['id'] = (string)$item_count;
+            $line['product_id'] = $item->getProductId();
+            $line['product_variant_id'] = $variant;
+            $line['quantity'] = (int)$item->getQtyOrdered();
+            $line['price'] = $item->getPrice();
+            $lines[] = $line;
+            $item_count += 1;
+        }
+        $oneCart['lines'] = $lines;
+
+        $jsonData = "";
+
+        //enconde to JSON
+        try {
+
+            $jsonData = json_encode($oneCart);
+
+        } catch (Exception $e) {
+            //json encode failed
+            Mage::helper('mailchimp')->logError("Carts ".$cart->getId()." json encode failed");
+        }
 
+        return $jsonData;
+    }
+    // @todo calculate the checkout url for the cart
+    protected function _getCheckoutUrl($cart)
+    {
+        $token = md5(rand(0, 9999999));
+        $url = Mage::getModel('core/url')->setStore($cart->getStoreId())->getUrl('', array('_nosid' => true)) . 'mailchimp/cart/loadquote?id=' . $cart->getEntityId() . '&token=' . $token;
+        $cart->setMailchimpToken($token);
+        return $url;
+    }
+    protected function _getCustomer($cart,$mailchimpStoreId)
+    {
+        $api = $this->_getApi();
+        $customers = $api->ecommerce->customers->getByEmail($mailchimpStoreId, $cart->getCustomerEmail());
+        if($customers['total_items']>0)
+        {
+            $customer = array(
+              'id' => $customers['customers'][0]['id']
+            );
+        }
+        else
+        {
+            if (!$cart->getCustomerId())
+            {
+                $customer = array(
+                    "id" => "GUEST-" . date('Y-m-d-H-i-s'),
+                    "email_address" => $cart->getCustomerEmail(),
+                    "opt_in_status" => false
+                );
+            }
+            else
+            {
+                $customer = array(
+                    "id" => $cart->getCustomerId(),
+                    "email_address" => $cart->getCustomerEmail(),
+                    "opt_in_status" => Ebizmarts_MailChimp_Model_Api_Customers::DEFAULT_OPT_IN
+                );
+            }
+        }
+        $firstName = $cart->getCustomerFirstname();
+        if($firstName)
+        {
+            $customer["first_name"] = $firstName;
+        }
+        $lastName = $cart->getCustomerLastname();
+        if($lastName)
+        {
+            $customer["last_name"] = $lastName;
+        }
+        $billingAddress = $cart->getBillingAddress();
+        if ($billingAddress)
+        {
+            $street = $billingAddress->getStreet();
+            $address = array();
+            if($street[0]) {
+                $address['address1'] = $street[0];
+            }
+            if(count($street) > 1) {
+                $address['address1'] = $street[1];
+            }
+            if($billingAddress->getCity()) {
+                $address['city'] = $billingAddress->getCity();
+            }
+            if($billingAddress->getRegion()) {
+                $address['province'] = $billingAddress->getRegion();
+            }
+            if($billingAddress->getRegionCode()) {
+                $address['province_code'] = $billingAddress->getRegionCode();
+            }
+            if($billingAddress->getPostcode()) {
+                $address['postal_code'] = $billingAddress->getPostcode();
+            }
+            if($billingAddress->getCountry()) {
+                $address['country'] = $billingAddress->getCountry();
+                $address['country_code'] = Mage::getModel('directory/country')->loadByCode($billingAddress->getCountry())->getName();
+            }
+//            $customer["address"] = array(
+//                "address1" => $street[0],
+//                "address2" => count($street) > 1 ? $street[1] : "",
+//                "city" => $billingAddress->getCity(),
+//                "province" => $billingAddress->getRegion() ? $billingAddress->getRegion() : "",
+//                "province_code" => $billingAddress->getRegionCode() ? $billingAddress->getRegionCode() : "",
+//                "postal_code" => $billingAddress->getPostcode(),
+//                "country" => $billingAddress->getCountry() ? Mage::getModel('directory/country')->loadByCode($billingAddress->getCountry())->getName() : '',
+//                "country_code" => $billingAddress->getCountry() ? $billingAddress->getCountry() : ''
+//            );
+            if(count($address)) {
+                $customer['address'] = $address;
+            }
+        }
+        //company
+        if ($billingAddress->getCompany())
+        {
+            $customer["company"] = $billingAddress->getCompany();
+        }
+        return $customer;
+    }
+    protected function _getApi()
+    {
+        if(!$this->api)
+        {
+            $apiKey = Mage::helper('mailchimp')->getConfigValue(Ebizmarts_MailChimp_Model_Config::GENERAL_APIKEY);
+            $this->api = new Ebizmarts_Mailchimp($apiKey,null,'Mailchimp4Magento'.(string)Mage::getConfig()->getNode('modules/Ebizmarts_MailChimp/version'));
+        }
+        return $this->api;
+    }
 }
\ No newline at end of file
diff --git a/app/code/community/Ebizmarts/MailChimp/Model/Api/Customers.php b/app/code/community/Ebizmarts/MailChimp/Model/Api/Customers.php
index 9169417cf..3ab756c31 100644
--- a/app/code/community/Ebizmarts/MailChimp/Model/Api/Customers.php
+++ b/app/code/community/Ebizmarts/MailChimp/Model/Api/Customers.php
@@ -43,7 +43,6 @@ public function createBatchJson($mailchimpStoreId)
             //enconde to JSON
             try {
                 $customerJson = json_encode($data);
-
             } catch (Exception $e) {
                 //json encode failed
                 Mage::helper('mailchimp')->logError("Customer ".$customer->getId()." json encode failed");
@@ -129,6 +128,49 @@ public function update($customer)
             $customer->setData("mailchimp_sync_modified", 1);
         }
     }
+
+    public function updateOrderData($mailchimpStoreId){
+        try {
+            $apiKey = Mage::helper('mailchimp')->getConfigValue(Ebizmarts_MailChimp_Model_Config::GENERAL_APIKEY);
+            $mailchimpApi = new Ebizmarts_Mailchimp($apiKey, null, 'Mailchimp4Magento' . (string)Mage::getConfig()->getNode('modules/Ebizmarts_MailChimp/version'));
+            $mailchimpCustomers = $mailchimpApi->ecommerce->customers->getAll($mailchimpStoreId);
+            $mailchimpTotalCustomers = $mailchimpCustomers['total_items'];
+            $mailchimpCustomers = $mailchimpApi->ecommerce->customers->getAll($mailchimpStoreId, 'customers', null, $mailchimpTotalCustomers);
+            $customerArray = array();
+            $counter = 0;
+            $batchId = Ebizmarts_MailChimp_Model_Config::IS_CUSTOMER . '_' . date('Y-m-d-H-i-s');
+            foreach ($mailchimpCustomers['customers'] as $customer) {
+                //get all orders sent to MailChimp made with that same email address
+                $orderCollection = Mage::getModel('sales/order')->getCollection()
+                    ->addFieldToFilter('state', array('eq' =>'complete'))
+                    ->addFieldToFilter('customer_email', array('eq' => $customer['email_address']))
+                    ->addFieldToFilter('mailchimp_sync_delta', array('notnull' => true))
+                    ->addFieldToFilter('mailchimp_sync_delta', array('neq' => ''))
+                    ->addFieldToFilter('mailchimp_sync_delta', array('gt' => Mage::helper('mailchimp')->getMCMinSyncDateFlag()));
+                $totalSpent = 0;
+                // if MailChimp order count is different than the amount of orders successfully sent to MailChimp update values
+                if(count($orderCollection) != $customer['orders_count']) {
+                    foreach ($orderCollection as $order) {
+                        $totalSpent += $order->getGrandTotal();
+                    }
+                    if (count($orderCollection) || $totalSpent) {
+                        $customerArray[$counter]['method'] = "PATCH";
+                        $customerArray[$counter]['path'] = "/ecommerce/stores/" . $mailchimpStoreId . "/customers/".$customer['id'];
+                        $customerArray[$counter]['operation_id'] = $batchId . '_' . $customer['id'];
+                        $customerArray[$counter]['body'] = json_encode(array('id' => $customer['id'], 'orders_count' => count($orderCollection), 'total_spent' => $totalSpent));
+                        $counter += 1;
+                    }
+                }
+            }
+            return $customerArray;
+        }
+        catch(Mailchimp_Error $e){
+            Mage::helper('mailchimp')->logError($e->getFriendlyMessage());
+        }
+        catch(Exception $e){
+            Mage::helper('mailchimp')->logError($e->getMessage());
+        }
+    }
 //    public function updateOld($customer)
 //    {
 //        try {
diff --git a/app/code/community/Ebizmarts/MailChimp/Model/Api/Orders.php b/app/code/community/Ebizmarts/MailChimp/Model/Api/Orders.php
index 8178de43e..f8e44db08 100644
--- a/app/code/community/Ebizmarts/MailChimp/Model/Api/Orders.php
+++ b/app/code/community/Ebizmarts/MailChimp/Model/Api/Orders.php
@@ -13,44 +13,96 @@ class Ebizmarts_MailChimp_Model_Api_Orders
 {
 
     const BATCH_LIMIT = 100;
+    protected $api = null;
 
+    /**
+     * Set the request for orders to be created on MailChimp
+     * 
+     * @param $mailchimpStoreId
+     * @return array
+     */
     public function createBatchJson($mailchimpStoreId)
     {
-            //create missing products first
-            $collection = Mage::getModel('sales/order')->getCollection()
-                ->addAttributeToSelect('status')
-                ->addAttributeToSelect('mailchimp_sync_delta')
-                ->addAttributeToSelect('entity_id')
-                ->addFieldToFilter('status', 'complete')
-                ->addFieldToFilter('mailchimp_sync_delta', array(
-                    array('null' => true),
-                    array('eq' => ''),
-                    array('lt' => Mage::helper('mailchimp')->getMCMinSyncDateFlag())
-                ));
-            $collection->getSelect()->limit(self::BATCH_LIMIT);
-
-            $batchArray = array();
-            $batchId = Ebizmarts_MailChimp_Model_Config::IS_ORDER.'_'.date('Y-m-d-H-i-s');
-            $counter = 0;
-            foreach ($collection as $order) {
-                $orderJson = $this->GeneratePOSTPayload($order);
-                if (!empty($orderJson)) {
-                    $batchArray[$counter]['method'] = "POST";
-                    $batchArray[$counter]['path'] = '/ecommerce/stores/' . $mailchimpStoreId . '/orders';
-                    $batchArray[$counter]['operation_id'] = $batchId . '_' . $order->getEntityId();
-                    $batchArray[$counter]['body'] = $orderJson;
-
-                    //update order delta
-                    $order->setData("mailchimp_sync_delta", Varien_Date::now());
-                    $order->save();
-                }
-                $counter += 1;
+        //create missing products first
+        $collection = Mage::getModel('sales/order')->getCollection()
+            ->addAttributeToSelect('status')
+            ->addAttributeToSelect('mailchimp_sync_delta')
+            ->addAttributeToSelect('entity_id')
+            ->addFieldToFilter('state', 'complete')
+            ->addFieldToFilter('mailchimp_sync_delta', array(
+                array('null' => true),
+                array('eq' => ''),
+                array('lt' => Mage::helper('mailchimp')->getMCMinSyncDateFlag())
+            ));
+        $collection->getSelect()->limit(self::BATCH_LIMIT);
+
+        $batchArray = array();
+        $batchId = Ebizmarts_MailChimp_Model_Config::IS_ORDER.'_'.date('Y-m-d-H-i-s');
+        $counter = 0;
+        foreach ($collection as $order) {
+            $orderJson = $this->GeneratePOSTPayload($order,$mailchimpStoreId);
+            if (!empty($orderJson)) {
+                $batchArray[$counter]['method'] = "POST";
+                $batchArray[$counter]['path'] = '/ecommerce/stores/' . $mailchimpStoreId . '/orders';
+                $batchArray[$counter]['operation_id'] = $batchId . '_' . $order->getEntityId();
+                $batchArray[$counter]['body'] = $orderJson;
+
+                //update order delta
+                $order->setData("mailchimp_sync_delta", Varien_Date::now());
+                $order->save();
             }
+            $counter += 1;
+        }
 
-            return $batchArray;
+        return $batchArray;
     }
 
-    protected function GeneratePOSTPayload($order_from_collection)
+    /**
+     * Set the orders to be removed from MailChimp because they were canceled
+     * 
+     * @param $mailchimpStoreId
+     * @return array
+     */
+    public function createCanceledBatchJson($mailchimpStoreId)
+    {
+        //create missing products first
+        $collection = Mage::getModel('sales/order')->getCollection()
+            ->addAttributeToSelect('status')
+            ->addAttributeToSelect('mailchimp_sync_delta')
+            ->addAttributeToSelect('entity_id')
+            ->addFieldToFilter('state', 'canceled')
+            ->addFieldToFilter('mailchimp_sync_delta', array(
+                array('null' => true),
+                array('eq' => ''),
+                array('lt' => Mage::helper('mailchimp')->getMCMinSyncDateFlag())
+            ));
+        $collection->getSelect()->limit(self::BATCH_LIMIT);
+
+        $batchArray = array();
+        $counter = 0;
+        foreach ($collection as $order) {
+            if (!empty($orderJson)) {
+                $batchArray[$counter]['method'] = "DELETE";
+                $batchArray[$counter]['path'] = '/ecommerce/stores/' . $mailchimpStoreId . '/orders/' . $order->getEntityId();
+
+                //update order delta
+                $order->setData("mailchimp_sync_delta", Varien_Date::now());
+                $order->save();
+            }
+            $counter += 1;
+        }
+
+        return $batchArray;
+    }
+
+    /**
+     * Set all the data for each order to be sent
+     *
+     * @param $order_from_collection
+     * @param $mailchimpStoreId
+     * @return string
+     */
+    protected function GeneratePOSTPayload($order_from_collection,$mailchimpStoreId)
     {
         $order = Mage::getModel('sales/order')->load($order_from_collection->getEntityId());
 
@@ -61,6 +113,8 @@ protected function GeneratePOSTPayload($order_from_collection)
         }
         $data['currency_code'] = $order->getOrderCurrencyCode();
         $data['order_total'] = $order->getGrandTotal();
+        $data['tax_total'] = $order->getTaxAmount();
+        $data['shipping_total'] = $order->getShippingAmount();
         $data['processed_at_foreign'] = $order->getCreatedAt();
         $data['lines'] = array();
 
@@ -97,36 +151,46 @@ protected function GeneratePOSTPayload($order_from_collection)
             unset($data['lines']);
         }
         //customer data
-        if ((bool)$order->getCustomerIsGuest()) {
-            $data["customer"] = array(
-                "id" => "GUEST-" . date('Y-m-d-H-i-s'),
-                "email_address" => $order->getCustomerEmail(),
-                "opt_in_status" => false
-            );
-        } else {
-            $data["customer"] = array(
-                "id" => $order->getCustomerId(),
-                "email_address" => $order->getCustomerEmail(),
-                "opt_in_status" => Ebizmarts_MailChimp_Model_Api_Customers::DEFAULT_OPT_IN
+        $api = $this->_getApi();
+        $customers = $api->ecommerce->customers->getByEmail($mailchimpStoreId, $order->getCustomerEmail());
+        if($customers['total_items']>0)
+        {
+            $data['customer'] = array(
+                'id' => $customers['customers'][0]['id']
             );
-            $billingAddress = $order->getBillingAddress();
-            $street = $billingAddress->getStreet();
+        }
+        else {
+            if ((bool)$order->getCustomerIsGuest()) {
+                $data["customer"] = array(
+                    "id" => "GUEST-" . date('Y-m-d-H-i-s'),
+                    "email_address" => $order->getCustomerEmail(),
+                    "opt_in_status" => false
+                );
+            } else {
+                $data["customer"] = array(
+                    "id" => $order->getCustomerId(),
+                    "email_address" => $order->getCustomerEmail(),
+                    "opt_in_status" => Ebizmarts_MailChimp_Model_Api_Customers::DEFAULT_OPT_IN
+                );
+            }
             $data["customer"]["first_name"] = $order->getCustomerFirstname();
             $data["customer"]["last_name"] = $order->getCustomerLastname();
-            $data["customer"]["address"] = array(
-                "address1" => $street[0],
-                "address2" => count($street)>1 ? $street[1] : "",
-                "city" => $billingAddress->getCity(),
-                "province" => $billingAddress->getRegion() ? $billingAddress->getRegion() : "",
-                "province_code" => $billingAddress->getRegionCode() ? $billingAddress->getRegionCode() : "",
-                "postal_code" => $billingAddress->getPostcode(),
-                "country" => Mage::getModel('directory/country')->loadByCode($billingAddress->getCountry())->getName(),
-                "country_code" => $billingAddress->getCountry()
-            );
-            //company
-            if ($billingAddress->getCompany()) {
-                $data["customer"]["company"] = $billingAddress->getCompany();
-            }
+        }
+        $billingAddress = $order->getBillingAddress();
+        $street = $billingAddress->getStreet();
+        $data["customer"]["address"] = array(
+            "address1" => $street[0],
+            "address2" => count($street) > 1 ? $street[1] : "",
+            "city" => $billingAddress->getCity(),
+            "province" => $billingAddress->getRegion() ? $billingAddress->getRegion() : "",
+            "province_code" => $billingAddress->getRegionCode() ? $billingAddress->getRegionCode() : "",
+            "postal_code" => $billingAddress->getPostcode(),
+            "country" => Mage::getModel('directory/country')->loadByCode($billingAddress->getCountry())->getName(),
+            "country_code" => $billingAddress->getCountry()
+        );
+        //company
+        if ($billingAddress->getCompany()) {
+            $data["customer"]["company"] = $billingAddress->getCompany();
         }
 
         $jsonData = "";
@@ -143,4 +207,19 @@ protected function GeneratePOSTPayload($order_from_collection)
 
         return $jsonData;
     }
+
+    /**
+     * Get Api Object
+     *
+     * @return Ebizmarts_Mailchimp|null
+     */
+    protected function _getApi()
+    {
+        if(!$this->api)
+        {
+            $apiKey = Mage::helper('mailchimp')->getConfigValue(Ebizmarts_MailChimp_Model_Config::GENERAL_APIKEY);
+            $this->api = new Ebizmarts_Mailchimp($apiKey,null,'Mailchimp4Magento'.(string)Mage::getConfig()->getNode('modules/Ebizmarts_MailChimp/version'));
+        }
+        return $this->api;
+    }
 }
\ No newline at end of file
diff --git a/app/code/community/Ebizmarts/MailChimp/Model/Api/Products.php b/app/code/community/Ebizmarts/MailChimp/Model/Api/Products.php
index 988e56b6a..d179a254e 100644
--- a/app/code/community/Ebizmarts/MailChimp/Model/Api/Products.php
+++ b/app/code/community/Ebizmarts/MailChimp/Model/Api/Products.php
@@ -42,7 +42,7 @@ public function createBatchJson($mailchimpStoreId)
         $counter = 0;
         foreach ($collection as $product) {
             //define variants and root products
-            if($product->getMailchimpSyncModified()&&!$product->getMailchimpSyncDelta()) {
+            if($product->getMailchimpSyncModified()&&$product->getMailchimpSyncDelta()) {
                 $data = $this->_buildOldProductRequest($product,$batchId,$mailchimpStoreId);
             }
             else {
@@ -66,7 +66,6 @@ public function createBatchJson($mailchimpStoreId)
         }
         return $batchArray;
     }
-
     protected function _buildNewProductRequest($product,$batchId,$mailchimpStoreId)
     {
         $variantProducts = array();
@@ -164,7 +163,7 @@ protected function _buildProductData($product, $isVarient = true, $variants = nu
 
         //image
         $productMediaConfig = Mage::getModel('catalog/product_media_config');
-        $data["image_url"] = $productMediaConfig->getMediaUrl($product->getImage());;
+        $data["image_url"] = $productMediaConfig->getMediaUrl($product->getImage());
 
         //missing data
         $data["published_at_foreign"] = "";
@@ -208,100 +207,8 @@ protected function _buildProductData($product, $isVarient = true, $variants = nu
     public function update($product)
     {
         if (Mage::helper('mailchimp')->isEcomSyncDataEnabled()) {
-//            $product->setData('mailchimp_sync_delta', null);
             $product->setData('mailchimp_sync_error', '');
             $product->setData('mailchimp_sync_modified',1);
         }
     }
-//    public function old_update($product)
-//    {
-//        try {
-//
-//            if (Mage::helper('mailchimp')->isEcomSyncDataEnabled()) {
-//                $apiKey = Mage::helper('mailchimp')->getConfigValue(Ebizmarts_MailChimp_Model_Config::GENERAL_APIKEY);
-//                $mailchimpStoreId = Mage::helper('mailchimp')->getMCStoreId();
-//
-//                if ($product->getTypeId() == Mage_Catalog_Model_Product_Type::TYPE_SIMPLE || $product->getTypeId() == Mage_Catalog_Model_Product_Type::TYPE_VIRTUAL || $product->getTypeId() == "downloadable") {
-//                    $data = $this->_buildProductData($product);
-//
-//                    $parentIds = Mage::getResourceSingleton('catalog/product_type_configurable')->getParentIdsByChild($product->getId());
-////                    $parentIds = $product->getTypeInstance()->getParentIdsByChild($product->getId());
-//
-//                    if (empty($parentIds)) {
-//                        $parentIds = array($product->getId());
-//                    }
-//
-//                    //add or update variant
-//                    $mailchimpApi = new Ebizmarts_Mailchimp($apiKey);
-//                    foreach ($parentIds as $parentId) {
-//                        $mailchimpApi->ecommerce->products->variants->addOrModify(
-//                            $mailchimpStoreId,
-//                            $parentId,
-//                            $data["id"],
-//                            $data["title"],
-//                            $data["url"],
-//                            $data["sku"],
-//                            $data["price"],
-//                            $data["inventory_quantity"],
-//                            $data["image_url"],
-//                            $data["backorders"],
-//                            $data["visibility"]
-//                        );
-//                    }
-//
-//                } else if ($product->getTypeId() == Mage_Catalog_Model_Product_Type::TYPE_CONFIGURABLE) {
-//                    //check if it was never uploaded and create it
-//                    if (!$product->getMailchimpSyncDelta()) {
-//
-//                        $dataRootProduct = $this->_buildProductData($product, false, array($product));
-//
-//                        $mailchimpApi = new Ebizmarts_Mailchimp($apiKey);
-//                        $mailchimpApi->ecommerce->products->add(
-//                            $mailchimpStoreId,
-//                            $dataRootProduct["id"],
-//                            $dataRootProduct["title"],
-//                            $dataRootProduct["handle"],
-//                            $dataRootProduct["url"],
-//                            $dataRootProduct["description"],
-//                            $dataRootProduct["type"],
-//                            $dataRootProduct["vendor"],
-//                            $dataRootProduct["image_url"],
-//                            $dataRootProduct["variants"],
-//                            $dataRootProduct["published_at_foreign"]
-//                        );
-//                    } else {
-//
-//                        throw new Exception('MailChimp root products can not be updated');
-//                    }
-//
-//                } else {
-//                    //@toDo bundle
-//
-//                    throw new Exception('These type of products are not yet supported');
-//                }
-//
-//                //update product delta
-//                $product->setData("mailchimp_sync_delta", Varien_Date::now());
-//                $product->setData("mailchimp_sync_error", "");
-//                $product->save();
-//            }
-//
-//        } catch (Mailchimp_Error $e) {
-//            Mage::helper('mailchimp')->logError($e->getFriendlyMessage());
-//
-//            //update product delta
-//            $product->setData("mailchimp_sync_delta", Varien_Date::now());
-//            $product->setData("mailchimp_sync_error", $e->getFriendlyMessage());
-//            $product->save();
-//
-//        } catch
-//        (Exception $e) {
-//            Mage::helper('mailchimp')->logError($e->getMessage());
-//
-//            //update product delta
-//            $product->setData("mailchimp_sync_delta", Varien_Date::now());
-//            $product->setData("mailchimp_sync_error", $e->getMessage());
-//            $product->save();
-//        }
-//    }
 }
\ No newline at end of file
diff --git a/app/code/community/Ebizmarts/MailChimp/Model/Api/Stores.php b/app/code/community/Ebizmarts/MailChimp/Model/Api/Stores.php
index c3b6c330a..2acbb483d 100644
--- a/app/code/community/Ebizmarts/MailChimp/Model/Api/Stores.php
+++ b/app/code/community/Ebizmarts/MailChimp/Model/Api/Stores.php
@@ -22,7 +22,7 @@ public function getMailChimpStore()
         $apiKey = Mage::helper('mailchimp')->getConfigValue(Ebizmarts_MailChimp_Model_Config::GENERAL_APIKEY);
 
         if (!is_null($apiKey) && $apiKey != "") {
-            $api = new Ebizmarts_Mailchimp($apiKey);
+            $api = new Ebizmarts_Mailchimp($apiKey,null,'Mailchimp4Magento'.(string)Mage::getConfig()->getNode('modules/Ebizmarts_MailChimp/version'));
             $storeExists = null;
             $storeId = Mage::helper('mailchimp')->getMCStoreId();
 
@@ -51,13 +51,17 @@ public function getMailChimpStore()
     }
 
     /**
+     * @param $store_id
+     * @param null $listId
      * @throws Exception
      */
-    public function createMailChimpStore($store_id)
+    public function createMailChimpStore($store_id,$listId=null)
     {
         $apiKey = Mage::helper('mailchimp')->getConfigValue(Ebizmarts_MailChimp_Model_Config::GENERAL_APIKEY);
         if (!is_null($apiKey) && $apiKey != "") {
-            $listId = Mage::helper('mailchimp')->getConfigValue(Ebizmarts_MailChimp_Model_Config::GENERAL_LIST);
+            if(!$listId) {
+                $listId = Mage::helper('mailchimp')->getConfigValue(Ebizmarts_MailChimp_Model_Config::GENERAL_LIST);
+            }
 
             if (!is_null($listId) && $listId != "")
             {
@@ -70,7 +74,7 @@ public function createMailChimpStore($store_id)
 
                 $currencyCode = Mage::helper('mailchimp')->getConfigValue(Mage_Directory_Model_Currency::XML_PATH_CURRENCY_DEFAULT);
 
-                $api = new Ebizmarts_Mailchimp($apiKey);
+                $api = new Ebizmarts_Mailchimp($apiKey,null,'Mailchimp4Magento'.(string)Mage::getConfig()->getNode('modules/Ebizmarts_MailChimp/version'));
                 $api->ecommerce->stores->add($store_id, $listId, $storeName, 'Magento', null, $store_email, $currencyCode);
 
             } else {
@@ -86,13 +90,13 @@ public function createMailChimpStore($store_id)
      */
     public function deleteStore($storeId)
     {
-        if (Mage::helper('mailchimp')->isEcomSyncDataEnabled()) {
+//        if (Mage::helper('mailchimp')->isEcomSyncDataEnabled()) {
             $apiKey = Mage::helper('mailchimp')->getConfigValue(Ebizmarts_MailChimp_Model_Config::GENERAL_APIKEY);
-            $api = new Ebizmarts_Mailchimp($apiKey);
+            $api = new Ebizmarts_Mailchimp($apiKey,null,'Mailchimp4Magento'.(string)Mage::getConfig()->getNode('modules/Ebizmarts_MailChimp/version'));
             $api->ecommerce->stores->delete($storeId);
             $connection = Mage::getSingleton('core/resource')->getConnection('core_write');
             $resource = Mage::getResourceModel('mailchimp/synchbatches');
             $connection->update($resource->getMainTable(),array('status'=>'canceled'),"status = 'pending'");
-        }
+//        }
     }
 }
\ No newline at end of file
diff --git a/app/code/community/Ebizmarts/MailChimp/Model/Api/Subscribers.php b/app/code/community/Ebizmarts/MailChimp/Model/Api/Subscribers.php
index 87d96081a..4bb7ec817 100644
--- a/app/code/community/Ebizmarts/MailChimp/Model/Api/Subscribers.php
+++ b/app/code/community/Ebizmarts/MailChimp/Model/Api/Subscribers.php
@@ -23,7 +23,7 @@ public function createBatchJson($listId, $storeId, $limit)
             ->addFieldToFilter('mailchimp_sync_delta', array(
                 array('null' => true),
                 array('eq' => ''),
-                array('lt' => Mage::helper('mailchimp')->getMCMinSyncDateFlag())
+                array('lt' => Mage::helper('mailchimp')->getConfigValue(Ebizmarts_MailChimp_Model_Config::GENERAL_SUB_MCMINSYNCDATEFLAG, $storeId))
             ));
         $collection->getSelect()->limit($limit);
         $subscriberArray = array();
@@ -68,31 +68,60 @@ protected function _buildSubscriberData($subscriber)
         if($mergeVars) {
             $data["merge_fields"] = $mergeVars;
         }
-        $data["status_if_new"] = Mage::helper('mailchimp')->getStatus($subscriber);
+        $data["status_if_new"] = $this->_getMCStatus($subscriber->getStatus());
 
         return $data;
     }
 
-    public function addGuestSubscriber($subscriber){
+    /**
+     * @param $subscriber
+     */
+    public function updateSubscriber($subscriber){
         $apiKey = Mage::helper('mailchimp')->getConfigValue(Ebizmarts_MailChimp_Model_Config::GENERAL_APIKEY);
         $listId = Mage::helper('mailchimp')->getConfigValue(Ebizmarts_MailChimp_Model_Config::GENERAL_LIST);
-        $status = Mage::helper('mailchimp')->getStatus();
-        $api = new Ebizmarts_Mailchimp($apiKey);
+        $status = $this->_getMCStatus($subscriber->getStatus());
+        $api = new Ebizmarts_Mailchimp($apiKey,null,'Mailchimp4Magento'.(string)Mage::getConfig()->getNode('modules/Ebizmarts_MailChimp/version'));
         $mergeVars = $this->getMergeVars($subscriber);
+
         try {
-            $api->lists->members->add($listId, null, $status, $subscriber->getSubscriberEmail(), $mergeVars);
+            $md5HashEmail = md5(strtolower($subscriber->getSubscriberEmail()));
+            $api->lists->members->addOrUpdate($listId, $md5HashEmail, null, $status, $mergeVars, null, null, null, null, $subscriber->getSubscriberEmail(), $status);
+            $subscriber->setData("mailchimp_sync_delta", Varien_Date::now());
+            $subscriber->setData("mailchimp_sync_error", "");
         }catch(Mailchimp_Error $e){
-            $this->logError($e->getFriendlyMessage());
+            Mage::helper('mailchimp')->logError($e->getFriendlyMessage());
             Mage::getSingleton('adminhtml/session')->addError($e->getFriendlyMessage());
         }catch (Exception $e){
-            $this->logError($e->getMessage());
+            Mage::helper('mailchimp')->logError($e->getMessage());
+        }
+    }
+
+    /**
+     * Get status to send confirmation if Need to Confirm enabled on Magento
+     *
+     * @param null $status
+     * @return string
+     */
+    protected function _getMCStatus($status = null)
+    {
+        if($status == Mage_Newsletter_Model_Subscriber::STATUS_UNSUBSCRIBED) {
+            $status = 'unsubscribed';
+        }
+        elseif(Mage::helper('mailchimp')->getConfigValue(Mage_Newsletter_Model_Subscriber::XML_PATH_CONFIRMATION_FLAG) && ($status == Mage_Newsletter_Model_Subscriber::STATUS_NOT_ACTIVE || $status == Mage_Newsletter_Model_Subscriber::STATUS_UNCONFIRMED))
+        {
+            $status = 'pending';
+        }
+        elseif($status == Mage_Newsletter_Model_Subscriber::STATUS_SUBSCRIBED)
+        {
+            $status = 'subscribed';
         }
+        return $status;
     }
 
     public function removeSubscriber($subscriber){
         $apiKey = Mage::helper('mailchimp')->getConfigValue(Ebizmarts_MailChimp_Model_Config::GENERAL_APIKEY);
         $listId = Mage::helper('mailchimp')->getConfigValue(Ebizmarts_MailChimp_Model_Config::GENERAL_LIST);
-        $api = new Ebizmarts_Mailchimp($apiKey);
+        $api = new Ebizmarts_Mailchimp($apiKey,null,'Mailchimp4Magento'.(string)Mage::getConfig()->getNode('modules/Ebizmarts_MailChimp/version'));
         try {
             $md5HashEmail = md5(strtolower($subscriber->getSubscriberEmail()));
             $api->lists->members->update($listId, $md5HashEmail, null, 'unsubscribed');
@@ -106,6 +135,26 @@ public function removeSubscriber($subscriber){
         }
     }
 
+    /**
+     * @param $subscriber
+     */
+    public function deleteSubscriber($subscriber){
+        $apiKey = Mage::helper('mailchimp')->getConfigValue(Ebizmarts_MailChimp_Model_Config::GENERAL_APIKEY);
+        $listId = Mage::helper('mailchimp')->getConfigValue(Ebizmarts_MailChimp_Model_Config::GENERAL_LIST);
+        $api = new Ebizmarts_Mailchimp($apiKey);
+        try {
+            $md5HashEmail = md5(strtolower($subscriber->getSubscriberEmail()));
+            $api->lists->members->update($listId, $md5HashEmail, null, 'cleaned');
+        }
+        catch(Mailchimp_Error $e){
+            Mage::helper('mailchimp')->logError($e->getFriendlyMessage());
+            Mage::getSingleton('adminhtml/session')->addError($e->getFriendlyMessage());
+        }
+        catch (Exception $e){
+            Mage::helper('mailchimp')->logError($e->getMessage());
+        }
+    }
+
     protected function getMergeVars($subscriber)
     {
         $mergeVars = array();
@@ -116,5 +165,117 @@ protected function getMergeVars($subscriber)
             $mergeVars['LNAME'] = $subscriber->getSubscriberLastname();
         }
         return (!empty($mergeVars)) ? $mergeVars : null;
+
+//        $storeId = $subscriber->getStoreId();
+//        $maps = unserialize(Mage::helper('mailchimp')->getConfigValue(Ebizmarts_MailChimp_Model_Config::GENERAL_MAP_FIELDS, $storeId));
+//        $websiteId = Mage::getModel('core/store')->load($storeId)->getWebsiteId();
+//        $customer = Mage::getModel('customer/customer')->setWebsiteId($websiteId)->loadByEmail($subscriber->getSubscriberEmail());
+//        $mergeVars = array();
+//        foreach ($maps as $map) {
+//            $customAtt = $map['magento'];
+//            $chimpTag = $map['mailchimp'];
+//            if ($chimpTag && $customAtt) {
+//                $key = strtoupper($chimpTag);
+//                $attrSetId = Mage::getResourceModel('eav/entity_attribute_collection')
+//                    ->setEntityTypeFilter(1)
+//                    ->addSetInfo()
+//                    ->getData();
+//                foreach ($attrSetId as $attribute) {
+//                    if ($attribute['attribute_id'] == $customAtt) {
+//                        $attributeCode = $attribute['attribute_code'];
+//                        if ($customer->getId()) {
+//                            if ($customer->getData($attributeCode)) {
+//                                switch ($attributeCode) {
+//                                    case 'default_billing':
+//                                    case 'default_shipping':
+//                                        $addr = explode('_', $attributeCode);
+//                                        $address = $customer->{'getPrimary' . ucfirst($addr[1]) . 'Address'}();
+//                                        if (!$address) {
+//                                            if ($customer->{'getDefault' . ucfirst($addr[1])}()) {
+//                                                $address = Mage::getModel('customer/address')->load($customer->{'getDefault' . ucfirst($addr[1])}());
+//                                            }
+//                                        }
+//                                        if ($address) {
+//                                            $mergeVars[$key] = array(
+//                                                'addr1' => $address->getStreet(1),
+//                                                'addr2' => $address->getStreet(2),
+//                                                'city' => $address->getCity(),
+//                                                'state' => (!$address->getRegion() ? $address->getCity() : $address->getRegion()),
+//                                                'zip' => $address->getPostcode(),
+//                                                'country' => $address->getCountryId()
+//                                            );
+//                                            $telephone = $address->getTelephone();
+//                                            if ($telephone) {
+//                                                $mergeVars['TELEPHONE'] = $telephone;
+//                                            }
+//                                            $company = $address->getCompany();
+//                                            if ($company) {
+//                                                $mergeVars['COMPANY'] = $company;
+//                                            }
+//                                            $country = $address->getCountryId();
+//                                            if ($country) {
+//                                                $countryName = Mage::getModel('directory/country')->load($country)->getName();
+//                                                $mergeVars['COUNTRY'] = $countryName;
+//                                            }
+//                                            $zipCode = $address->getPostcode();
+//                                            if ($zipCode) {
+//                                                $mergeVars['ZIPCODE'] = $zipCode;
+//                                            }
+//                                        }
+//                                        break;
+//                                    case 'gender':
+//                                        $genderValue = $customer->getData($attributeCode);
+//                                        if ($genderValue == 1) {
+//                                            $mergeVars[$key] = 'Male';
+//                                        } elseif ($genderValue == 2) {
+//                                            $mergeVars[$key] = 'Female';
+//                                        }
+//                                        break;
+//                                    case 'group_id':
+//                                        $group_id = (int)$customer->getData($attributeCode);
+//                                        $customerGroup = Mage::helper('customer')->getGroups()->toOptionHash();
+//                                        $mergeVars[$key] = $customerGroup[$group_id];
+//                                        break;
+//                                    default:
+//                                        if($customer->getData($attributeCode)) {
+//                                            $mergeVars[$key] = $customer->getData($attributeCode);
+//                                        }
+//                                        break;
+//                                }
+//                            }
+//                        } else {
+//                            switch ($attributeCode) {
+//                                case 'group_id':
+//                                    $mergeVars[$key] = 'NOT LOGGED IN';
+//                                    break;
+//                                case 'store_id':
+//                                    $mergeVars[$key] = $storeId;
+//                                    break;
+//                                case 'website_id':
+//                                    $websiteId = Mage::getModel('core/store')->load($storeId)->getWebsiteId();
+//                                    $mergeVars[$key] = $websiteId;
+//                                    break;
+//                                case 'created_in':
+//                                    $storeCode = Mage::getModel('core/store')->load($storeId)->getCode();
+//                                    $mergeVars[$key] = $storeCode;
+//                                    break;
+//                                case 'firstname':
+//                                    $firstName = $subscriber->getSubscriberFirstname();
+//                                    if ($firstName) {
+//                                        $mergeVars[$key] = $firstName;
+//                                    }
+//                                    break;
+//                                case 'lastname':
+//                                    $lastName = $subscriber->getSubscriberLastname();
+//                                    if ($lastName) {
+//                                        $mergeVars[$key] = $lastName;
+//                                    }
+//                            }
+//                        }
+//                    }
+//                }
+//            }
+//        }
+//        return (!empty($mergeVars)) ? $mergeVars : null;
     }
 }
\ No newline at end of file
diff --git a/app/code/community/Ebizmarts/MailChimp/Model/Config.php b/app/code/community/Ebizmarts/MailChimp/Model/Config.php
index 198236359..49c1c904a 100755
--- a/app/code/community/Ebizmarts/MailChimp/Model/Config.php
+++ b/app/code/community/Ebizmarts/MailChimp/Model/Config.php
@@ -11,30 +11,41 @@
  */
 class Ebizmarts_MailChimp_Model_Config
 {
-    const GENERAL_ACTIVE            = 'mailchimp/general/active';
-    const GENERAL_APIKEY            = 'mailchimp/general/apikey';
-    const GENERAL_OAUTH_WIZARD      = 'mailchimp/general/oauth_wizard';
-    const GENERAL_ACCOUNT_DETAILS   = 'mailchimp/general/account_details';
-    const GENERAL_LIST              = 'mailchimp/general/list';
-    const GENERAL_MCSTOREID         = 'mailchimp/general/storeid';
-    const GENERAL_MCMINSYNCDATEFLAG = 'mailchimp/general/mcminsyncdateflag';
-    const GENERAL_TWO_WAY_SYNC      = 'mailchimp/general/webhook_active';
-    const GENERAL_UNSUBSCRIBE       = 'mailchimp/general/webhook_delete';
-    const GENERAL_LOG               = 'mailchimp/general/enable_log';
+    const GENERAL_ACTIVE                = 'mailchimp/general/active';
+    const GENERAL_APIKEY                = 'mailchimp/general/apikey';
+    const GENERAL_OAUTH_WIZARD          = 'mailchimp/general/oauth_wizard';
+    const GENERAL_ACCOUNT_DETAILS       = 'mailchimp/general/account_details';
+    const GENERAL_LIST                  = 'mailchimp/general/list';
+    const GENERAL_OLD_LIST              = 'mailchimp/general/old_list';
+    const GENERAL_LIST_CHANGED_SCOPES   = 'mailchimp/general/list_changed_scopes';
+    const GENERAL_MCSTOREID             = 'mailchimp/general/storeid';
+    const GENERAL_MCMINSYNCDATEFLAG     = 'mailchimp/general/mcminsyncdateflag';
+    const GENERAL_SUB_MCMINSYNCDATEFLAG = 'mailchimp/general/sub_mcminsyncdateflag';
+    const GENERAL_TWO_WAY_SYNC          = 'mailchimp/general/webhook_active';
+    const GENERAL_UNSUBSCRIBE           = 'mailchimp/general/webhook_delete';
+    const GENERAL_LOG                   = 'mailchimp/general/enable_log';
+//    const GENERAL_MAP_FIELDS            = 'mailchimp/general/map_fields';
 
-    const ECOMMERCE_ACTIVE          = 'mailchimp/ecommerce/active';
+    const ECOMMERCE_ACTIVE              = 'mailchimp/ecommerce/active';
 
-    const ENABLE_POPUP              = 'mailchimp/emailcatcher/popup_general';
-    const POPUP_HEADING             = 'mailchimp/emailcatcher/popup_heading';
-    const POPUP_TEXT                = 'mailchimp/emailcatcher/popup_text';
-    const POPUP_FNAME               = 'mailchimp/emailcatcher/popup_fname';
-    const POPUP_LNAME               = 'mailchimp/emailcatcher/popup_lname';
-    const POPUP_WIDTH               = 'mailchimp/emailcatcher/popup_width';
-    const POPUP_HEIGHT              = 'mailchimp/emailcatcher/popup_height';
-    const POPUP_SUBSCRIPTION        = 'mailchimp/emailcatcher/popup_subscription';
-    const POPUP_CAN_CANCEL          = 'mailchimp/emailcatcher/popup_cancel';
-    const POPUP_COOKIE_TIME         = 'mailchimp/emailcatcher/popup_cookie_time';
-    const POPUP_INSIST              = 'mailchimp/emailcatcher/popup_insist';
+    const ENABLE_POPUP                  = 'mailchimp/emailcatcher/popup_general';
+    const POPUP_HEADING                 = 'mailchimp/emailcatcher/popup_heading';
+    const POPUP_TEXT                    = 'mailchimp/emailcatcher/popup_text';
+    const POPUP_FNAME                   = 'mailchimp/emailcatcher/popup_fname';
+    const POPUP_LNAME                   = 'mailchimp/emailcatcher/popup_lname';
+    const POPUP_WIDTH                   = 'mailchimp/emailcatcher/popup_width';
+    const POPUP_HEIGHT                  = 'mailchimp/emailcatcher/popup_height';
+    const POPUP_SUBSCRIPTION            = 'mailchimp/emailcatcher/popup_subscription';
+    const POPUP_CAN_CANCEL              = 'mailchimp/emailcatcher/popup_cancel';
+    const POPUP_COOKIE_TIME             = 'mailchimp/emailcatcher/popup_cookie_time';
+    const POPUP_INSIST                  = 'mailchimp/emailcatcher/popup_insist';
+
+    const ABANDONEDCART_ACTIVE      = 'mailchimp/abandonedcart/active';
+    const ABANDONEDCART_FIRSTDATE   = 'mailchimp/abandonedcart/firstdate';
+    const ABANDONEDCART_PAGE        = 'mailchimp/abandonedcart/page';
+
+    const WARNING_MESSAGE           = 'mailchimp/warning_message';
+    const POPUP_MESSAGE             = 'mailchimp/popup_message';
 
     const IS_CUSTOMER   = "CUS";
     const IS_PRODUCT    = "PRO";
diff --git a/app/code/community/Ebizmarts/MailChimp/Model/Cron.php b/app/code/community/Ebizmarts/MailChimp/Model/Cron.php
index 360be4bba..f2e3d6f43 100644
--- a/app/code/community/Ebizmarts/MailChimp/Model/Cron.php
+++ b/app/code/community/Ebizmarts/MailChimp/Model/Cron.php
@@ -18,19 +18,7 @@ class Ebizmarts_MailChimp_Model_Cron
 
     public function syncBatchData($cron)
     {
-        $mailchimpStoreId = Mage::helper('mailchimp')->getMCStoreId();
-        $subscriberLimit = Ebizmarts_MailChimp_Model_Api_subscribers::BATCH_LIMIT;
-        $stores = Mage::app()->getStores();
-
-        Mage::getModel('mailchimp/api_batches')->getResults($mailchimpStoreId);
-        Mage::getModel('mailchimp/api_batches')->sendEcommerceBatch($mailchimpStoreId);
-        foreach ($stores as $store) {
-            if($subscriberLimit > 0) {
-                $batchResponse = array();
-                list($batchResponse, $subscriberLimit) = Mage::getModel('mailchimp/api_batches')->sendSubscriberBatch($store->getId(), $subscriberLimit);
-            }else{
-                break;
-            }
-        }
+        Mage::getModel('mailchimp/api_batches')->handleEcommerceBatches();
+        Mage::getModel('mailchimp/api_batches')->handleSubscriberBatches();
     }
 }
\ No newline at end of file
diff --git a/app/code/community/Ebizmarts/MailChimp/Model/Observer.php b/app/code/community/Ebizmarts/MailChimp/Model/Observer.php
index 3b1f28058..c68f47cca 100755
--- a/app/code/community/Ebizmarts/MailChimp/Model/Observer.php
+++ b/app/code/community/Ebizmarts/MailChimp/Model/Observer.php
@@ -22,31 +22,9 @@ public function saveConfig(Varien_Event_Observer $observer)
     {
         $apiKey = Mage::helper('mailchimp')->getConfigValue(Ebizmarts_MailChimp_Model_Config::GENERAL_APIKEY);
         $generalEnabled = Mage::helper('mailchimp')->getConfigValue(Ebizmarts_MailChimp_Model_Config::GENERAL_ACTIVE);
-        $ecommerceEnabled = Mage::helper('mailchimp')->getConfigValue(Ebizmarts_MailChimp_Model_Config::ECOMMERCE_ACTIVE);
         $listId = Mage::helper('mailchimp')->getConfigValue(Ebizmarts_MailChimp_Model_Config::GENERAL_LIST);
-        if($generalEnabled) {
-            if($ecommerceEnabled) {
-                try {
-                    /**
-                     * CREATE MAILCHIMP STORE
-                     */
-                    $mailchimpStore = Mage::getModel('mailchimp/api_stores')->getMailChimpStore();
-                    if (!$mailchimpStore) {
-                        Mage::helper('mailchimp')->resetMCEcommerceData();
-                    }
-                    if (!Mage::helper('mailchimp')->getMCStoreId()) {
-                        Mage::getSingleton('adminhtml/session')->addWarning('The MailChimp store was not created properly, please save your configuration to create it.');
-                    }
-
-                } catch (Mailchimp_Error $e) {
-                    Mage::helper('mailchimp')->logError($e->getFriendlyMessage());
-                    Mage::getSingleton('adminhtml/session')->addError($e->getFriendlyMessage());
-
-                } catch (Exception $e) {
-                    Mage::getSingleton('adminhtml/session')->addError($e->getMessage());
-                }
-            }
 
+        if($generalEnabled && $listId) {
             $this->_createWebhook($listId, $apiKey);
         }
 
@@ -63,7 +41,7 @@ protected function _createWebhook($listId, $apiKey)
         if (FALSE != strstr($hookUrl, '?', true)) {
             $hookUrl = strstr($hookUrl, '?', true);
         }
-        $api = new Ebizmarts_Mailchimp($apiKey);
+        $api = new Ebizmarts_Mailchimp($apiKey,null,'Mailchimp4Magento'.(string)Mage::getConfig()->getNode('modules/Ebizmarts_MailChimp/version'));
         if(Mage::helper('mailchimp')->getConfigValue(Ebizmarts_MailChimp_Model_Config::GENERAL_TWO_WAY_SYNC)) {
             $events = array(
                 'subscribe' => true,
@@ -114,6 +92,9 @@ protected function _createWebhook($listId, $apiKey)
         {
             Mage::helper('mailchimp')->logError($e->getFriendlyMessage());
             Mage::getSingleton('adminhtml/session')->addError($e->getFriendlyMessage());
+            if($e->getMailchimpDetails() == 'The resource submitted could not be validated. For field-specific details, see the \'errors\' array.'){
+                Mage::getSingleton('adminhtml/session')->addError('Your store could not be accessed by MailChimp\'s Api. Please confirm the site is accessible externally to allow the webhook creation.');
+            }
         }
         catch (Exception $e){
             Mage::helper('mailchimp')->logError($e->getMessage());
@@ -125,8 +106,13 @@ public function handleSubscriber(Varien_Event_Observer $observer)
         $isEnabled = Mage::helper('mailchimp')->getConfigValue(Ebizmarts_MailChimp_Model_Config::GENERAL_ACTIVE);
         if($isEnabled){
             $subscriber = $observer->getEvent()->getSubscriber();
+            if(!Mage::getSingleton('customer/session')->isLoggedIn()&&!Mage::app()->getStore()->isAdmin()) {
+                Mage::getModel('core/cookie')->set('email', $subscriber->getSubscriberEmail(), null, null, null, null, false);
+            }
+
+
             if (TRUE === $subscriber->getIsStatusChanged()) {
-                Mage::getModel('mailchimp/api_subscribers')->addGuestSubscriber($subscriber);
+                Mage::getModel('mailchimp/api_subscribers')->updateSubscriber($subscriber);
             }
         }
     }
@@ -137,7 +123,7 @@ public function handleSubscriberDeletion(Varien_Event_Observer $observer)
         if($isEnabled){
             $subscriber = $observer->getEvent()->getSubscriber();
             if (TRUE === $subscriber->getIsStatusChanged()) {
-                Mage::getModel('mailchimp/api_subscribers')->removeSubscriber($subscriber);
+                Mage::getModel('mailchimp/api_subscribers')->deleteSubscriber($subscriber);
             }
         }
     }
@@ -206,9 +192,86 @@ public function saveCampaignData(Varien_Event_Observer $observer)
         }
     }
 
+    public function removeCampaignData(Varien_Event_Observer $observer)
+    {
+        if($this->_getCampaignCookie())
+        {
+            Mage::getModel('core/cookie')->delete('mailchimp_campaign_id');
+        }
+        return $observer;
+    }
+
     protected function _getCampaignCookie()
     {
-        $ret = Mage::app()->getCookie()->get('mailchimp_campaign_id');
-        return $ret;
+        $cookie = Mage::getModel('core/cookie')->get('mailchimp_campaign_id');
+        if($cookie&&Mage::getModel('core/cookie')->getLifetime('mailchimp_campaign_id')==3600) {
+            return $cookie;
+        }
+        else {
+            return null;
+        }
+    }
+
+    public function addAbandonedToSalesOrderGrid($observer) {
+        $block = $observer->getEvent()->getBlock();
+        if($block instanceof Mage_Adminhtml_Block_Sales_Order_Grid) {
+            $block->addColumnAfter('mailchimp_abandonedcart_flag', array(
+                    'header' => Mage::helper('mailchimp')->__('Cart Recovered'),
+                    'index' => 'mailchimp_abandonedcart_flag',
+                    'align' => 'center',
+                    'filter' => false,
+                    'renderer' => 'mailchimp/adminhtml_sales_order_grid_renderer_abandoned',
+                    'sortable' => false,
+                    'width' => 170
+                )
+                , 'created_at');
+        }
+        return $observer;
+    }
+
+    protected function _createMailChimpStore(){
+        try {
+            /**
+             * CREATE MAILCHIMP STORE
+             */
+            $mailchimpStore = Mage::getModel('mailchimp/api_stores')->getMailChimpStore();
+            if (!$mailchimpStore) {
+                Mage::helper('mailchimp')->resetMCEcommerceData();
+            }
+            if (!Mage::helper('mailchimp')->getMCStoreId()) {
+                Mage::getSingleton('adminhtml/session')->addWarning('The MailChimp store was not created properly, please save your configuration to create it.');
+            }
+
+        } catch (Mailchimp_Error $e) {
+            Mage::helper('mailchimp')->logError($e->getFriendlyMessage());
+            Mage::getSingleton('adminhtml/session')->addError($e->getFriendlyMessage());
+
+        } catch (Exception $e) {
+            Mage::getSingleton('adminhtml/session')->addError($e->getMessage());
+        }
+    }
+    
+
+    public function loadCustomerToQuote(Varien_Event_Observer $observer)
+    {
+        $quote = $observer->getEvent()->getQuote();
+        if (!Mage::getSingleton('customer/session')->isLoggedIn() && Mage::getStoreConfig(Ebizmarts_MailChimp_Model_Config::ENABLE_POPUP, $quote->getStoreId())) {
+            $action = Mage::app()->getRequest()->getActionName();
+            $onCheckout = ($action == 'saveOrder' || $action == 'savePayment' || $action == 'saveShippingMethod' || $action == 'saveBilling');
+            if(Mage::getModel('core/cookie')->get('email') && Mage::getModel('core/cookie')->get('email')!= 'none' && !$onCheckout) {
+                $emailCookie = Mage::getModel('core/cookie')->get('email');
+                $emailCookieArr = explode('/', $emailCookie);
+                $email = $emailCookieArr[0];
+                $email = str_replace(' ', '+', $email);
+                if ($quote->getCustomerEmail() != $email) {
+                    $quote->setCustomerEmail($email);
+                }
+            }
+        }
+        $campaignId = $this->_getCampaignCookie();
+        if($campaignId){
+            $quote->setMailChimpCampaignId($campaignId);
+        }
+        return $observer;
     }
 }
diff --git a/app/code/community/Ebizmarts/MailChimp/Model/ProcessWebhook.php b/app/code/community/Ebizmarts/MailChimp/Model/ProcessWebhook.php
index f682ebd56..ad8bfb1c8 100755
--- a/app/code/community/Ebizmarts/MailChimp/Model/ProcessWebhook.php
+++ b/app/code/community/Ebizmarts/MailChimp/Model/ProcessWebhook.php
@@ -35,39 +35,25 @@ public function processWebhookData(array $data)
 //            Mage::app()->setCurrentStore($store);
 //        }
 
-        //Object for cache clean
-        $object = new stdClass();
-        $object->requestParams = array();
-        $object->requestParams['id'] = $listId;
-
-        if (isset($data['data']['email'])) {
-            $object->requestParams['email_address'] = $data['data']['email'];
-        }
-        $cacheHelper = Mage::helper('mailchimp/cache');
 
         switch ($data['type']) {
             case 'subscribe':
                 $this->_subscribe($data);
-                $cacheHelper->clearCache('listSubscribe', $object);
                 break;
             case 'unsubscribe':
                 $this->_unsubscribe($data);
-                $cacheHelper->clearCache('listUnsubscribe', $object);
                 break;
             case 'cleaned':
                 $this->_clean($data);
-                $cacheHelper->clearCache('listUnsubscribe', $object);
                 break;
 //            case 'campaign':
 //                $this->_campaign($data);
 //                break;
             case 'upemail':
                 $this->_updateEmail($data);
-                $cacheHelper->clearCache('listUpdateMember', $object);
                 break;
 //            case 'profile':
 //                $this->_profile($data);
-//                $cacheHelper->clearCache('listUpdateMember', $object);
 //                break;
         }
 
diff --git a/app/code/community/Ebizmarts/MailChimp/Model/System/Config/Backend/Apikey.php b/app/code/community/Ebizmarts/MailChimp/Model/System/Config/Backend/Apikey.php
new file mode 100644
index 000000000..7c5be0f12
--- /dev/null
+++ b/app/code/community/Ebizmarts/MailChimp/Model/System/Config/Backend/Apikey.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * mc-magento Magento Component
+ *
+ * @category Ebizmarts
+ * @package mc-magento
+ * @author Ebizmarts Team <info@ebizmarts.com>
+ * @copyright Ebizmarts (http://ebizmarts.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ * @date: 8/4/16 5:56 PM
+ * @file: Apikey.php
+ */
+class Ebizmarts_MailChimp_Model_System_Config_Backend_Apikey extends Mage_Core_Model_Config_Data
+{
+    protected function _beforeSave()
+    {
+        $groups = $this->getData('groups');
+        $active = $groups['ecommerce']['fields']['active']['value'];
+        if ($this->isValueChanged()&&$active) {
+            if ($this->getScope() == 'default') {
+                if($this->getOldValue()) {
+                    Mage::helper('mailchimp')->deleteStore();
+                    Mage::helper('mailchimp')->resetErrors();
+                    Mage::helper('mailchimp')->resetCampaign();
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/community/Ebizmarts/MailChimp/Model/System/Config/Backend/Ecommerce.php b/app/code/community/Ebizmarts/MailChimp/Model/System/Config/Backend/Ecommerce.php
new file mode 100644
index 000000000..50bcd9ea8
--- /dev/null
+++ b/app/code/community/Ebizmarts/MailChimp/Model/System/Config/Backend/Ecommerce.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * mc-magento Magento Component
+ *
+ * @category Ebizmarts
+ * @package mc-magento
+ * @author Ebizmarts Team <info@ebizmarts.com>
+ * @copyright Ebizmarts (http://ebizmarts.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ * @date: 8/4/16 8:28 PM
+ * @file: List.php
+ */
+class Ebizmarts_MailChimp_Model_System_Config_Backend_Ecommerce extends Mage_Core_Model_Config_Data
+{
+
+    protected function _afterSave()
+    {
+        $groups = $this->getData('groups');
+        $active = $groups['general']['fields']['active']['value'];
+        $storeId = Mage::helper('mailchimp')->getMCStoreId();
+
+        if($this->isValueChanged()&&$active&&!$storeId&&$this->getValue())
+        {
+            Mage::helper('mailchimp')->createStore($this->getValue());
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/community/Ebizmarts/MailChimp/Model/System/Config/Backend/List.php b/app/code/community/Ebizmarts/MailChimp/Model/System/Config/Backend/List.php
new file mode 100644
index 000000000..560068e2d
--- /dev/null
+++ b/app/code/community/Ebizmarts/MailChimp/Model/System/Config/Backend/List.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * mc-magento Magento Component
+ *
+ * @category Ebizmarts
+ * @package mc-magento
+ * @author Ebizmarts Team <info@ebizmarts.com>
+ * @copyright Ebizmarts (http://ebizmarts.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ * @date: 8/4/16 8:28 PM
+ * @file: List.php
+ */
+class Ebizmarts_MailChimp_Model_System_Config_Backend_List extends Mage_Core_Model_Config_Data
+{
+    protected function _beforeSave()
+    {
+        $groups = $this->getData('groups');
+        $active = $groups['ecommerce']['fields']['active']['value'];
+
+        if($this->isValueChanged()&&$active) {
+            if($this->getScope()=='default') {
+                if($this->getOldValue()) {
+                    Mage::helper('mailchimp')->deleteStore();
+                    Mage::helper('mailchimp')->resetErrors();
+                    Mage::helper('mailchimp')->resetCampaign();
+                }
+            }
+        }
+    }
+    protected function _afterSave()
+    {
+        $groups = $this->getData('groups');
+        $active = $groups['ecommerce']['fields']['active']['value'];
+
+        if($this->isValueChanged()&&$active)
+        {
+            Mage::helper('mailchimp')->createStore($this->getValue());
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/community/Ebizmarts/MailChimp/Model/System/Config/Source/Account.php b/app/code/community/Ebizmarts/MailChimp/Model/System/Config/Source/Account.php
index e121dc48b..6ee278c1f 100755
--- a/app/code/community/Ebizmarts/MailChimp/Model/System/Config/Source/Account.php
+++ b/app/code/community/Ebizmarts/MailChimp/Model/System/Config/Source/Account.php
@@ -31,7 +31,7 @@ public function __construct()
         $mcStoreId = (Mage::helper('mailchimp')->getMCStoreId()) ? Mage::helper('mailchimp')->getMCStoreId() : null;
         $api = null;
         if($configValue){
-            $api = new Ebizmarts_Mailchimp($configValue);
+            $api = new Ebizmarts_Mailchimp($configValue,null,'Mailchimp4Magento'.(string)Mage::getConfig()->getNode('modules/Ebizmarts_MailChimp/version'));
         }
         if($api) {
             try {
@@ -44,6 +44,8 @@ public function __construct()
                     $this->_account_details['total_products'] = $totalProducts['total_items'];
                     $totalOrders = $api->ecommerce->orders->getAll($mcStoreId, 'total_items');
                     $this->_account_details['total_orders'] = $totalOrders['total_items'];
+                    $totalCarts = $api->ecommerce->carts->getAll($mcStoreId, 'total_items');
+                    $this->_account_details['total_carts'] = $totalCarts['total_items'];
                 }else{
                     $this->_account_details['store_exists'] = false;
                 }
@@ -73,10 +75,11 @@ public function toOptionArray()
                 array(
                     array('value' => 3, 'label' => Mage::helper('mailchimp')->__('  Total Customers:') . ' ' . $this->_account_details['total_customers']),
                     array('value' => 4, 'label' => Mage::helper('mailchimp')->__('  Total Products:') . ' ' . $this->_account_details['total_products']),
-                    array('value' => 5, 'label' => Mage::helper('mailchimp')->__('  Total Orders:') . ' ' . $this->_account_details['total_orders'])
+                    array('value' => 5, 'label' => Mage::helper('mailchimp')->__('  Total Orders:') . ' ' . $this->_account_details['total_orders']),
+                    array('value' => 6, 'label' => Mage::helper('mailchimp')->__('  Total Carts:') . ' ' . $this->_account_details['total_carts'])
                     ));
             }elseif(Mage::helper('mailchimp')->getConfigValue(Ebizmarts_MailChimp_Model_Config::ECOMMERCE_ACTIVE)){
-                $returnArray = array_merge($returnArray, array(array('value' => 6, 'label' => Mage::helper('mailchimp')->__('Warning: The MailChimp store was not created properly, please save your configuration again.'))));
+                $returnArray = array_merge($returnArray, array(array('value' => 7, 'label' => Mage::helper('mailchimp')->__('Warning: The MailChimp store was not created properly, please save your configuration again.'))));
             }
                 return $returnArray;
         } elseif(!$this->_account_details) {
diff --git a/app/code/community/Ebizmarts/MailChimp/Model/System/Config/Source/Cmspage.php b/app/code/community/Ebizmarts/MailChimp/Model/System/Config/Source/Cmspage.php
new file mode 100644
index 000000000..3c1ecb63c
--- /dev/null
+++ b/app/code/community/Ebizmarts/MailChimp/Model/System/Config/Source/Cmspage.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * mc-magento Magento Component
+ *
+ * @category Ebizmarts
+ * @package mc-magento
+ * @author Ebizmarts Team <info@ebizmarts.com>
+ * @copyright Ebizmarts (http://ebizmarts.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ * @date: 7/6/16 2:56 PM
+ * @file: Cmspage.php
+ */
+class Ebizmarts_MailChimp_Model_System_Config_Source_Cmspage
+{
+
+    public function toOptionArray()
+    {
+        $collection = Mage::getModel('cms/page')->getCollection()->addOrder('title', 'asc');
+        return array('checkout/cart' => "Shopping Cart (default page)") + $collection->toOptionIdArray();
+    }
+
+}
diff --git a/app/code/community/Ebizmarts/MailChimp/Model/System/Config/Source/List.php b/app/code/community/Ebizmarts/MailChimp/Model/System/Config/Source/List.php
index ebb3700f6..3eefedf38 100755
--- a/app/code/community/Ebizmarts/MailChimp/Model/System/Config/Source/List.php
+++ b/app/code/community/Ebizmarts/MailChimp/Model/System/Config/Source/List.php
@@ -27,10 +27,18 @@ public function __construct()
     {
         if (is_null($this->_lists)) {
             $apiKey = Mage::helper('mailchimp')->getConfigValue(Ebizmarts_MailChimp_Model_Config::GENERAL_APIKEY);
-                if ($apiKey) {
-                    $api = new Ebizmarts_Mailchimp($apiKey);
+            if ($apiKey) {
+                try {
+                    $api = new Ebizmarts_Mailchimp($apiKey, null, 'Mailchimp4Magento' . (string)Mage::getConfig()->getNode('modules/Ebizmarts_MailChimp/version'));
                     $this->_lists = $api->lists->getLists(null, 'lists', null, 100);
+                    if (isset($this->_lists['lists']) && count($this->_lists['lists']) == 0) {
+                        $apiKeyArray = explode('-', $apiKey);
+                        Mage::getSingleton('adminhtml/session')->addWarning('Please create a list at <a target="_blank" href="https://' . $apiKeyArray[1] . '.admin.mailchimp.com/lists/new-list/">https://' . $apiKeyArray[1] . '.admin.mailchimp.com/lists/new-list/</a>');
+                    }
+                } catch(Mailchimp_Error $e) {
+                    Mage::getSingleton('adminhtml/session')->addError($e->getFriendlyMessage());
                 }
+            }
         }
     }
 
diff --git a/app/code/community/Ebizmarts/MailChimp/controllers/CartController.php b/app/code/community/Ebizmarts/MailChimp/controllers/CartController.php
new file mode 100644
index 000000000..cc8f36247
--- /dev/null
+++ b/app/code/community/Ebizmarts/MailChimp/controllers/CartController.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * mc-magento Magento Component
+ *
+ * @category Ebizmarts
+ * @package mc-magento
+ * @author Ebizmarts Team <info@ebizmarts.com>
+ * @copyright Ebizmarts (http://ebizmarts.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ * @date: 7/6/16 10:14 AM
+ * @file: CartController.php
+ */
+
+require_once Mage::getModuleDir('controllers', 'Mage_Checkout') . DS . 'CartController.php';
+
+class Ebizmarts_MailChimp_CartController  extends Mage_Checkout_CartController
+{
+    public function loadquoteAction()
+    {
+        $params = $this->getRequest()->getParams();
+        if (isset($params['id'])) {
+            //restore the quote
+            $quote = Mage::getModel('sales/quote')->load($params['id']);
+            $url = Mage::getUrl(Mage::getStoreConfig(Ebizmarts_MailChimp_Model_Config::ABANDONEDCART_PAGE, $quote->getStoreId()));
+            if(isset($params['mc_cid'])) {
+                $url .= '?mc_cid='.$params['mc_cid'];
+            }
+            if ((!isset($params['token']) || (isset($params['token']) && $params['token'] != $quote->getMailchimpToken()))) {
+                Mage::getSingleton('customer/session')->addNotice("Your token cart is incorrect");
+                $this->_redirect($url);
+            } else {
+                $quote->setMailchimpAbandonedcartFlag(1);
+                $quote->save();
+                if (!$quote->getCustomerId()) {
+                    $this->_getSession()->setQuoteId($quote->getId());
+                    $this->getResponse()
+                        ->setRedirect($url, 301);
+                } else {
+                    if (Mage::helper('customer')->isLoggedIn()) {
+                        $this->getResponse()
+                            ->setRedirect($url, 301);
+                    } else {
+                        Mage::getSingleton('customer/session')->addNotice("Login to complete your order");
+                        $url = '/customer/account/login';
+                        if(isset($params['mc_cid'])) {
+                            $url .= '?mc_cid='.$params['mc_cid'];
+                        }
+                        $this->getResponse()->setRedirect($url, 301);
+                        //$this->_redirect('customer/account/login',array('?','mc_cid='.$params['mc_cid']));
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/community/Ebizmarts/MailChimp/controllers/WebhookController.php b/app/code/community/Ebizmarts/MailChimp/controllers/WebhookController.php
index 1ad0f8461..0ee4f9e71 100755
--- a/app/code/community/Ebizmarts/MailChimp/controllers/WebhookController.php
+++ b/app/code/community/Ebizmarts/MailChimp/controllers/WebhookController.php
@@ -32,9 +32,9 @@ public function indexAction()
         $myKey = Mage::helper('mailchimp')->getWebhooksKey();
 
         //Validate "wkey" GET parameter
-        if ($myKey != $requestKey) {
+        if ($myKey == $requestKey) {
             if ($this->getRequest()->getPost('type')) {
-                Mage::getModel('mailchimp/processwebhook')->processWebhookData($this->getRequest()->getPost());
+                Mage::getModel('mailchimp/processWebhook')->processWebhookData($this->getRequest()->getPost());
             }
             else
             {
diff --git a/app/code/community/Ebizmarts/MailChimp/etc/config.xml b/app/code/community/Ebizmarts/MailChimp/etc/config.xml
index 4ee0877e0..8cce2e985 100755
--- a/app/code/community/Ebizmarts/MailChimp/etc/config.xml
+++ b/app/code/community/Ebizmarts/MailChimp/etc/config.xml
@@ -3,7 +3,7 @@
 <config>
     <modules>
         <Ebizmarts_MailChimp>
-            <version>1.0.4.2</version>
+            <version>1.0.6</version>
         </Ebizmarts_MailChimp>
     </modules>
     <global>
@@ -26,12 +26,20 @@
             </newsletter_subscriber_delete_after>
             <sales_order_place_before>
                 <observers>
-                    <mailchimp_subscribe_checkout>
+                    <mailchimp_subscribe_checkout_before>
                         <class>mailchimp/observer</class>
                         <method>saveCampaignData</method>
-                    </mailchimp_subscribe_checkout>
+                    </mailchimp_subscribe_checkout_before>
                 </observers>
             </sales_order_place_before>
+            <sales_order_place_after>
+                <observers>
+                    <mailchimp_subscribe_checkout_after>
+                        <class>mailchimp/observer</class>
+                        <method>removeCampaignData</method>
+                    </mailchimp_subscribe_checkout_after>
+                </observers>
+            </sales_order_place_after>
         </events>
         <models>
             <mailchimp>
@@ -86,8 +94,28 @@
                 <class>Ebizmarts_MailChimp_Helper</class>
             </mailchimp>
         </helpers>
+        <fieldsets>
+            <sales_convert_quote>
+                <mailchimp_abandonedcart_flag>
+                    <to_order>*</to_order>
+                </mailchimp_abandonedcart_flag>
+                <mailchimp_campaign_id>
+                    <to_order>*</to_order>
+                </mailchimp_campaign_id>
+            </sales_convert_quote>
+        </fieldsets>
     </global>
     <frontend>
+        <events>
+            <sales_quote_save_before>
+                <observers>
+                    <ebizmarts_mailchimp_quote_save>
+                        <class>mailchimp/observer</class>
+                        <method>loadCustomerToQuote</method>
+                    </ebizmarts_mailchimp_quote_save>
+                </observers>
+            </sales_quote_save_before>
+        </events>
         <translate>
             <modules>
                 <Ebizmarts_MailChimp>
@@ -134,6 +162,15 @@
             </updates>
         </layout>
         <events>
+            <core_block_abstract_to_html_before>
+                <observers>
+                    <mailchimp_add_abandoned_to_grid_order>
+                        <type>model</type>
+                        <class>mailchimp/observer</class>
+                        <method>addAbandonedToSalesOrderGrid</method>
+                    </mailchimp_add_abandoned_to_grid_order>
+                </observers>
+            </core_block_abstract_to_html_before>
             <admin_system_config_changed_section_mailchimp>
                 <observers>
                     <mailchimp_save_config>
@@ -175,6 +212,7 @@
         <mailchimp>
             <general>
                 <webhook_active>1</webhook_active>
+                <map_fields><![CDATA[a:20:{s:18:"_1468601283719_719";a:2:{s:9:"mailchimp";s:7:"WEBSITE";s:7:"magento";s:1:"1";}s:18:"_1468609069544_544";a:2:{s:9:"mailchimp";s:7:"STOREID";s:7:"magento";s:1:"2";}s:18:"_1469026825907_907";a:2:{s:9:"mailchimp";s:9:"STORECODE";s:7:"magento";s:1:"3";}s:18:"_1469027411717_717";a:2:{s:9:"mailchimp";s:6:"PREFIX";s:7:"magento";s:1:"4";}s:18:"_1469027418285_285";a:2:{s:9:"mailchimp";s:5:"FNAME";s:7:"magento";s:1:"5";}s:18:"_1469027422918_918";a:2:{s:9:"mailchimp";s:5:"MNAME";s:7:"magento";s:1:"6";}s:18:"_1469027429502_502";a:2:{s:9:"mailchimp";s:5:"LNAME";s:7:"magento";s:1:"7";}s:18:"_1469027434574_574";a:2:{s:9:"mailchimp";s:6:"SUFFIX";s:7:"magento";s:1:"8";}s:18:"_1469027444231_231";a:2:{s:9:"mailchimp";s:5:"EMAIL";s:7:"magento";s:1:"9";}s:18:"_1469027453439_439";a:2:{s:9:"mailchimp";s:6:"CGROUP";s:7:"magento";s:2:"10";}s:18:"_1469027462887_887";a:2:{s:9:"mailchimp";s:3:"DOB";s:7:"magento";s:2:"11";}s:18:"_1469027468903_903";a:2:{s:9:"mailchimp";s:7:"BILLING";s:7:"magento";s:2:"13";}s:18:"_1469027475632_632";a:2:{s:9:"mailchimp";s:8:"SHIPPING";s:7:"magento";s:2:"14";}s:18:"_1469027480560_560";a:2:{s:9:"mailchimp";s:3:"TAX";s:7:"magento";s:2:"15";}s:18:"_1469027486920_920";a:2:{s:9:"mailchimp";s:11:"ISCONFIRMED";s:7:"magento";s:2:"16";}s:18:"_1469027496512_512";a:2:{s:9:"mailchimp";s:9:"CREATEDAT";s:7:"magento";s:2:"17";}s:18:"_1469027502720_720";a:2:{s:9:"mailchimp";s:6:"GENDER";s:7:"magento";s:2:"18";}s:18:"_1469027508616_616";a:2:{s:9:"mailchimp";s:18:"DISABLEGROUPCHANGE";s:7:"magento";s:2:"35";}s:18:"_1469027532689_689";a:2:{s:9:"mailchimp";s:8:"LASTSYNC";s:7:"magento";s:3:"210";}s:17:"_1469027558098_98";a:2:{s:9:"mailchimp";s:9:"ERRORDESC";s:7:"magento";s:3:"211";}}]]></map_fields>
             </general>
             <emailcatcher>
                 <popup_cancel>1</popup_cancel>
@@ -186,6 +224,8 @@
                 <popup_cookie_time>1</popup_cookie_time>
                 <popup_insist>1</popup_insist>
             </emailcatcher>
+            <warning_message><![CDATA[Warning. If you save the configuration, the current store in mailchimp will be recreated]]></warning_message>
+            <popup_message><![CDATA[This will affect Automations created on your MailChimp account. Do you want to proceed?]]></popup_message>
         </mailchimp>
     </default>
     <crontab>
diff --git a/app/code/community/Ebizmarts/MailChimp/etc/system.xml b/app/code/community/Ebizmarts/MailChimp/etc/system.xml
index bcd3436c8..6a85b29e5 100755
--- a/app/code/community/Ebizmarts/MailChimp/etc/system.xml
+++ b/app/code/community/Ebizmarts/MailChimp/etc/system.xml
@@ -46,6 +46,7 @@
                             <label>API Key</label>
                             <frontend_type>text</frontend_type>
                             <sort_order>20</sort_order>
+                            <backend_model>mailchimp/system_config_backend_apikey</backend_model>
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
@@ -82,6 +83,7 @@
                             <label>General Subscription</label>
                             <frontend_type>select</frontend_type>
                             <source_model>mailchimp/system_config_source_list</source_model>
+                            <backend_model>mailchimp/system_config_backend_list</backend_model>
                             <sort_order>50</sort_order>
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
@@ -92,6 +94,29 @@
                             <can_be_empty>1</can_be_empty>
                             <comment><![CDATA[Synchronize Magento's General Subscription List with this MailChimp list.]]></comment>
                         </list>
+                        <reset_list translate="label comment">
+                            <label></label>
+                            <frontend_type>button</frontend_type>
+                            <frontend_model>mailchimp/adminhtml_system_config_resetList</frontend_model>
+                            <sort_order>52</sort_order>
+                            <show_in_default>1</show_in_default>
+                            <show_in_website>0</show_in_website>
+                            <show_in_store>0</show_in_store>
+                            <comment><![CDATA[Warning, read the manual before change the list.]]></comment>
+                            <depends>
+                                <active>1</active>
+                            </depends>
+                        </reset_list>
+                        <!--<map_fields translate="label comment">-->
+                            <!--<label>Customer Fields Mapping</label>-->
+                            <!--<frontend_model>mailchimp/adminhtml_system_config_form_field_mapfields</frontend_model>-->
+                            <!--<backend_model>adminhtml/system_config_backend_serialized_array</backend_model>-->
+                            <!--<sort_order>55</sort_order>-->
+                            <!--<show_in_default>1</show_in_default>-->
+                            <!--<show_in_website>0</show_in_website>-->
+                            <!--<show_in_store>0</show_in_store>-->
+                            <!--<comment><![CDATA[<a target="_blank" href="http://kb.mailchimp.com/article/all-the-merge-tags-cheatsheet">All The Merge Tags (Cheatsheet)</a>]]></comment>-->
+                        <!--</map_fields>-->
                         <webhook_active>
                             <label>Enable Two Way Sync</label>
                             <frontend_type>select</frontend_type>
@@ -328,6 +353,52 @@
                         </popup_insist>
                     </fields>
                 </emailcatcher>
+                <abandonedcart>
+                    <label>Abandoned Cart</label>
+                    <sort_order>500</sort_order>
+                    <frontend_type>text</frontend_type>
+                    <show_in_default>1</show_in_default>
+                    <show_in_website>0</show_in_website>
+                    <show_in_store>0</show_in_store>
+                    <fields>
+                        <active translate="label">
+                            <label>Enabled</label>
+                            <frontend_type>select</frontend_type>
+                            <source_model>adminhtml/system_config_source_yesno</source_model>
+                            <sort_order>10</sort_order>
+                            <show_in_default>1</show_in_default>
+                            <show_in_website>1</show_in_website>
+                            <show_in_store>1</show_in_store>
+                        </active>
+                        <firstdate translate="label">
+                            <label>First date</label>
+                            <frontend_type>date</frontend_type>
+                            <frontend_model>mailchimp/adminhtml_system_config_date</frontend_model>
+                            <sort_order>12</sort_order>
+                            <show_in_default>1</show_in_default>
+                            <show_in_website>1</show_in_website>
+                            <show_in_store>1</show_in_store>
+                            <comment><![CDATA[Carts previous than this value, will be ignored]]></comment>
+                            <depends>
+                                <active>1</active>
+                            </depends>
+                        </firstdate>
+                        <page translate="label comment">
+                            <label>Redirect page</label>
+                            <frontend_type>select</frontend_type>
+                            <source_model>mailchimp/system_config_source_cmspage</source_model>
+                            <sort_order>26</sort_order>
+                            <show_in_default>1</show_in_default>
+                            <show_in_website>1</show_in_website>
+                            <show_in_store>1</show_in_store>
+                            <comment><![CDATA[Where to redirect the customer]]></comment>
+                            <depends>
+                                <active>1</active>
+                            </depends>
+                        </page>
+                    </fields>
+                </abandonedcart>
+
             </groups>
         </mailchimp>
     </sections>
diff --git a/app/code/community/Ebizmarts/MailChimp/sql/mailchimp_setup/mysql4-install-0.0.1.php b/app/code/community/Ebizmarts/MailChimp/sql/mailchimp_setup/mysql4-install-0.0.1.php
index c8bba2e5e..eb1248e1a 100755
--- a/app/code/community/Ebizmarts/MailChimp/sql/mailchimp_setup/mysql4-install-0.0.1.php
+++ b/app/code/community/Ebizmarts/MailChimp/sql/mailchimp_setup/mysql4-install-0.0.1.php
@@ -87,7 +87,7 @@
 }
 catch (Exception $e)
 {
-    Mage::helper('mailchimp')->logError($e->getMessage());
+    Mage::log($e->getMessage());
 }
 
 $installer->run("
@@ -106,7 +106,7 @@
     mkdir($baseDir . DS . 'var' . DS . 'mailchimp');
 }
 catch (Exception $e){
-    Mage::helper('mailchimp')->logError($e->getMessage());
+    Mage::log($e->getMessage());
 }
 
 $installer->endSetup();
diff --git a/app/code/community/Ebizmarts/MailChimp/sql/mailchimp_setup/mysql4-upgrade-1.0.1-1.0.2.php b/app/code/community/Ebizmarts/MailChimp/sql/mailchimp_setup/mysql4-upgrade-1.0.1-1.0.2.php
index bc789e6ef..862e508bf 100644
--- a/app/code/community/Ebizmarts/MailChimp/sql/mailchimp_setup/mysql4-upgrade-1.0.1-1.0.2.php
+++ b/app/code/community/Ebizmarts/MailChimp/sql/mailchimp_setup/mysql4-upgrade-1.0.1-1.0.2.php
@@ -37,7 +37,7 @@
     ");
 }
 catch(Exception $e){
-    Mage::helper('mailchimp')->logError($e->getMessage());
+    Mage::log($e->getMessage());
 }
 
 $installer->endSetup();
\ No newline at end of file
diff --git a/app/code/community/Ebizmarts/MailChimp/sql/mailchimp_setup/mysql4-upgrade-1.0.3-1.0.4.php b/app/code/community/Ebizmarts/MailChimp/sql/mailchimp_setup/mysql4-upgrade-1.0.3-1.0.4.php
index 50680c581..c5a2e52ce 100644
--- a/app/code/community/Ebizmarts/MailChimp/sql/mailchimp_setup/mysql4-upgrade-1.0.3-1.0.4.php
+++ b/app/code/community/Ebizmarts/MailChimp/sql/mailchimp_setup/mysql4-upgrade-1.0.3-1.0.4.php
@@ -49,7 +49,7 @@
 }
 catch (Exception $e)
 {
-    Mage::helper('mailchimp')->logError($e->getMessage());
+    Mage::log($e->getMessage());
 }
 
 $installer->endSetup();
\ No newline at end of file
diff --git a/app/code/community/Ebizmarts/MailChimp/sql/mailchimp_setup/mysql4-upgrade-1.0.5-1.0.6.php b/app/code/community/Ebizmarts/MailChimp/sql/mailchimp_setup/mysql4-upgrade-1.0.5-1.0.6.php
new file mode 100644
index 000000000..69b85acf0
--- /dev/null
+++ b/app/code/community/Ebizmarts/MailChimp/sql/mailchimp_setup/mysql4-upgrade-1.0.5-1.0.6.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * mc-magento Magento Component
+ *
+ * @category Ebizmarts
+ * @package mc-magento
+ * @author Ebizmarts Team <info@ebizmarts.com>
+ * @copyright Ebizmarts (http://ebizmarts.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ * @date: 6/9/16 4:05 PM
+ * @file: mysql4-upgrade-1.0.1-1.0.2.php
+ */
+
+$installer = $this;
+
+$installer->startSetup();
+
+
+try {
+    $installer->run("
+ ALTER TABLE `{$this->getTable('sales_flat_quote')}` ADD column `mailchimp_deleted` INT(1) NOT NULL DEFAULT 0;
+ ALTER TABLE `{$this->getTable('sales_flat_quote')}` ADD column `mailchimp_token` VARCHAR(255) NOT NULL DEFAULT '';
+ ALTER TABLE `{$this->getTable('sales_flat_quote')}` ADD column `mailchimp_abandonedcart_flag` INT(1) NOT NULL DEFAULT 0;
+ ALTER TABLE `{$this->getTable('sales_flat_order')}` ADD column `mailchimp_abandonedcart_flag` INT(1) NOT NULL DEFAULT 0;
+");
+}
+catch (Exception $e)
+{
+    Mage::log($e->getMessage());
+}
+
+$installer->endSetup();
\ No newline at end of file
diff --git a/app/design/adminhtml/default/default/template/ebizmarts/mailchimp/system/config/fieldset/hint.phtml b/app/design/adminhtml/default/default/template/ebizmarts/mailchimp/system/config/fieldset/hint.phtml
index accab9b7e..1c5f5e7f8 100644
--- a/app/design/adminhtml/default/default/template/ebizmarts/mailchimp/system/config/fieldset/hint.phtml
+++ b/app/design/adminhtml/default/default/template/ebizmarts/mailchimp/system/config/fieldset/hint.phtml
@@ -4,7 +4,7 @@
  */
 ?>
 <div class="mailchimp-notice">
-    <img width="250px" height="56.8px" src="<?php echo $this->getSkinUrl('images/ebizmarts/Logo_Ebizmarts.png'); ?>"/>
+    <img width="244px" height="60px" src="https://ebizmarts-website.s3.amazonaws.com/Logo_Ebizmarts.png"/>
     <h4>
         <?php echo Mage::helper('mailchimp')->__('<strong style="color:#EA7601;">MailChimp For Magento v%s by</strong> <a target="_blank" href="http://ebizmarts.com"><strong>ebizmarts</strong></a>', $this->getMailChimpVersion()) ?>
         <br>
diff --git a/app/design/adminhtml/default/default/template/ebizmarts/mailchimp/system/config/form/field/array_dropdown.phtml b/app/design/adminhtml/default/default/template/ebizmarts/mailchimp/system/config/form/field/array_dropdown.phtml
new file mode 100644
index 000000000..5a270af7d
--- /dev/null
+++ b/app/design/adminhtml/default/default/template/ebizmarts/mailchimp/system/config/form/field/array_dropdown.phtml
@@ -0,0 +1,153 @@
+<?php
+/**
+ * @see Ebizmarts_MailChimp_Block_Adminhtml_System_Config_Form_Field_Mapfields
+ */
+?>
+
+<?php
+$_htmlId = $this->getHtmlId() ? $this->getHtmlId() : '_' . uniqid();
+
+$_colspan = 2;
+if (!$this->_addAfter) {
+    $_colspan -= 1;
+}
+$_colspan = $_colspan > 1 ? 'colspan="' . $_colspan . '"' : '';
+?>
+
+<div class="grid" id="grid<?php echo $_htmlId ?>">
+    <table cellpadding="0" cellspacing="0" class="border">
+        <tbody>
+
+            <tr class="headings" id="headings<?php echo $_htmlId ?>">
+<?php foreach ($this->_columns as $columnName => $column):?>
+                <th><?php echo $column['label'] ?></th>
+<?php endforeach;?>
+                <th <?php echo $_colspan?>></th>
+            </tr>
+
+            <tr id="addRow<?php echo $_htmlId ?>">
+                <td colspan="<?php echo count($this->_columns) ?>"></td>
+                <td <?php echo $_colspan?>>
+                    <button style="" onclick="" class="scalable add" type="button" id="addToEndBtn<?php echo $_htmlId ?>">
+                        <span><span><span><?php echo $this->_addButtonLabel ?></span></span></span>
+                    </button>
+                </td>
+            </tr>
+
+        </tbody>
+    </table>
+    <input type="hidden" name="<?php echo $this->getElement()->getName() ?>[__empty]" value="" />
+</div>
+<div id="empty<?php echo $_htmlId ?>">
+    <button style="" onclick="" class="scalable add" type="button" id="emptyAddBtn<?php echo $_htmlId ?>">
+        <span><span><span><?php echo $this->_addButtonLabel ?></span></span></span>
+    </button>
+</div>
+
+<script type="text/javascript">
+//<![CDATA[
+// create row creator
+var arrayRow<?php echo $_htmlId ?> = {
+    // define row prototypeJS template
+    template : new Template(
+        '<tr id="#{_id}">'
+<?php foreach ($this->_columns as $columnName => $column):?>
+            +'<td>'
+                +'<?php echo Mage::helper('core')->jsQuoteEscape($this->_renderCellTemplate($columnName)) ?>'
+            +'<\/td>'
+<?php endforeach;?>
+<?php if ($this->_addAfter):?>
+            +'<td><button onclick="" class="scalable add" type="button" id="addAfterBtn#{_id}"><span><span><span><?php echo Mage::helper('core')->jsQuoteEscape(Mage::helper('adminhtml')->__('Add after')) ?><\/span><\/span><\/span><\/button><\/td>'
+<?php endif;?>
+            +'<td><button onclick="arrayRow<?php echo $_htmlId ?>.del(\'#{_id}\')" class="scalable delete" type="button"><span><span><span><?php echo Mage::helper('core')->jsQuoteEscape(Mage::helper('adminhtml')->__('Delete')) ?><\/span><\/span><\/span><\/button><\/td>'
+        +'<\/tr>'
+    ),
+
+    rowsCount : 0,
+
+    add : function(templateData, insertAfterId)
+    {
+        // generate default template data
+        if ('' == templateData) {
+            var d = new Date();
+            templateData = {
+<?php foreach ($this->_columns as $columnName => $column):?>
+                <?php echo $columnName ?> : '',
+<?php endforeach;?>
+                _id : '_' + d.getTime() + '_' + d.getMilliseconds()
+            };
+        }
+
+        // insert before last row
+        if ('' == insertAfterId) {
+            Element.insert($('addRow<?php echo $_htmlId ?>'), {before: this.template.evaluate(templateData)});
+        }
+        // insert after specified row
+        else {
+            Element.insert($(insertAfterId), {after: this.template.evaluate(templateData)});
+        }
+
+// set the selected drop-down list item
+<?php foreach ($this->_columns as $columnName => $column):?>
+        <?php if($columnName == 'magento'):?>
+$$('select[name*=' + templateData._id +']').each(function(row){
+    var oldText = 'value="'+templateData.<?php echo $columnName?>+'"';
+    var newText = 'selected="selected" value="'+templateData.<?php echo $columnName?>+'"';
+    row.innerHTML = row.innerHTML.replace(oldText,newText);
+});
+        <?php endif; ?>
+<?php endforeach;?>
+<?php if ($this->_addAfter):?>
+        Event.observe('addAfterBtn' + templateData._id, 'click', this.add.bind(this, '', templateData._id));
+<?php endif;?>
+
+        this.rowsCount += 1;
+    },
+
+    del : function(rowId)
+    {
+        $(rowId).remove();
+        this.rowsCount -= 1;
+        if (0 == this.rowsCount) {
+            this.showButtonOnly();
+        }
+    },
+
+    showButtonOnly : function()
+    {
+        $('grid<?php echo $_htmlId ?>').hide();
+        $('empty<?php echo $_htmlId ?>').show();
+    }
+}
+
+// bind add action to "Add" button in last row
+Event.observe('addToEndBtn<?php echo $_htmlId ?>', 'click', arrayRow<?php echo $_htmlId ?>.add.bind(arrayRow<?php echo $_htmlId ?>, '', ''));
+
+// add existing rows
+<?php
+$_addAfterId = "headings{$_htmlId}";
+foreach ($this->getArrayRows() as $_rowId => $_row) {
+    echo "arrayRow{$_htmlId}.add(" . $_row->toJson() . ", '{$_addAfterId}');\n";
+    $_addAfterId = $_rowId;
+}
+?>
+
+// initialize standalone button
+$('empty<?php echo $_htmlId ?>').hide();
+Event.observe('emptyAddBtn<?php echo $_htmlId ?>', 'click', function () {
+    $('grid<?php echo $_htmlId ?>').show();
+    $('empty<?php echo $_htmlId ?>').hide();
+    arrayRow<?php echo $_htmlId ?>.add('', '');
+});
+
+// if no rows, hide grid and show button only
+<?php if (!$this->getArrayRows()):?>
+arrayRow<?php echo $_htmlId ?>.showButtonOnly();
+<?php endif;?>
+
+// toggle the grid, if element is disabled (depending on scope)
+<?php if ($this->getElement()->getDisabled()):?>
+toggleValueElements({checked:true}, $('grid<?php echo $_htmlId ?>').parentNode);
+<?php endif;?>
+//]]>
+</script>
diff --git a/app/design/adminhtml/default/default/template/ebizmarts/mailchimp/system/config/resetlist.phtml b/app/design/adminhtml/default/default/template/ebizmarts/mailchimp/system/config/resetlist.phtml
new file mode 100644
index 000000000..ed511ae6b
--- /dev/null
+++ b/app/design/adminhtml/default/default/template/ebizmarts/mailchimp/system/config/resetlist.phtml
@@ -0,0 +1,28 @@
+<script type="text/javascript">
+    //<![CDATA[
+    function preshow() {
+        if($('mailchimp_general_list').value != '') {
+            $('mailchimp_general_list').setAttribute('disabled',true);
+            $('changelist_button').setAttribute('style','display:yes');
+        }
+    }
+    function resetlist() {
+        if(confirm('<?php echo $this->getPopupMessage(); ?>')) {
+            $('mailchimp_general_list').removeAttribute('disabled');
+            $('changelist_button').setAttribute('style','display:none');
+            $('row_mailchimp_general_reset_list').down(9).setAttribute('style','display:none');
+            //$('row_mailchimp_general_reset_list').childElements('value').childElements('p').setAttribute('style','display:none');
+            Event.observe($('mailchimp_general_list'),'change',function() {
+                $('row_mailchimp_general_reset_list').down(9).setAttribute('style','display:yes;color:red;padding:5px;font-weight:bold;');
+                $('row_mailchimp_general_reset_list').down(9).update('<?php echo $this->getMessage() ?>');
+                $('row_mailchimp_general_reset_list').down(8).className = '';
+            });
+        }
+    }
+    window.onload=preshow;
+    //]]>
+
+</script>
+
+
+<?php echo $this->getButtonHtml(); ?>
\ No newline at end of file
diff --git a/app/design/frontend/base/default/template/ebizmarts/mailchimp/popup/emailcatcher.phtml b/app/design/frontend/base/default/template/ebizmarts/mailchimp/popup/emailcatcher.phtml
index 85f4d9b3e..80ac910b5 100755
--- a/app/design/frontend/base/default/template/ebizmarts/mailchimp/popup/emailcatcher.phtml
+++ b/app/design/frontend/base/default/template/ebizmarts/mailchimp/popup/emailcatcher.phtml
@@ -76,19 +76,20 @@
                             $counter = $_COOKIE['counter'];
                             //if(counter en config == counter en db){
                             if(($counter+1) >= Mage::getStoreConfig(Ebizmarts_MailChimp_Model_Config::POPUP_INSIST, Mage::app()->getStore()->getId())): ?>
-                        document.cookie = 'counter=; expires=Thu, 01 Jan 1970 00:00:01 GMT';
-                        createCookie('email=none', <?php Print(json_encode(Mage::getStoreConfig(Ebizmarts_MailChimp_Model_Config::POPUP_COOKIE_TIME, $this->_getStoreId()))); ?>);
+                        Mage.Cookies.clear('counter');
+                        //document.cookie = 'counter=; expires=Thu, 01 Jan 1970 00:00:01 GMT';
+                        createCookie('email', 'none', <?php Print(json_encode(Mage::getStoreConfig(Ebizmarts_MailChimp_Model_Config::POPUP_COOKIE_TIME, $this->_getStoreId()))); ?>);
                         <?php else: ?>
-                        createCookie('counter='+<?php Print(json_encode((1+$counter))); ?>,<?php Print(json_encode(Mage::getStoreConfig(Ebizmarts_MailChimp_Model_Config::POPUP_COOKIE_TIME, $this->_getStoreId()))); ?>);
+                        createCookie('counter',<?php Print(json_encode((1+$counter))); ?>,<?php Print(json_encode(Mage::getStoreConfig(Ebizmarts_MailChimp_Model_Config::POPUP_COOKIE_TIME, $this->_getStoreId()))); ?>);
 //                        $counter->setCounter(($counter->getCounter()+1));
 //                        $counter->save();
                         <?php endif; ?>
                         <?php else:
                         //create cookie counter in 0
                             if (Mage::getStoreConfig(Ebizmarts_MailChimp_Model_Config::POPUP_INSIST, Mage::app()->getStore()->getId()) == 1): ?>
-                        createCookie('email=none', <?php Print(json_encode(Mage::getStoreConfig(Ebizmarts_MailChimp_Model_Config::POPUP_COOKIE_TIME, $this->_getStoreId()))); ?>);
+                        createCookie('email','none', <?php Print(json_encode(Mage::getStoreConfig(Ebizmarts_MailChimp_Model_Config::POPUP_COOKIE_TIME, $this->_getStoreId()))); ?>);
                         <?php else: ?>
-                        createCookie('counter=1',<?php Print(json_encode(Mage::getStoreConfig(Ebizmarts_MailChimp_Model_Config::POPUP_COOKIE_TIME, $this->_getStoreId()))); ?>);
+                        createCookie('counter',1,<?php Print(json_encode(Mage::getStoreConfig(Ebizmarts_MailChimp_Model_Config::POPUP_COOKIE_TIME, $this->_getStoreId()))); ?>);
 //                            $newCounter = Mage::getModel('mailchimp/popup');
 //                            $newCounter->setCounter(1)->save();
 //                        createCookie('counter=' +<?php //Print(json_encode($newCounter->getId())); ?>//, <?php //Print(json_encode(Mage::getStoreConfig(Ebizmarts_MailChimp_Model_Config::POPUP_COOKIE_TIME, $this->_getStoreId()))); ?>//);
@@ -110,10 +111,9 @@
                             lname = inputFieldLName.value;
                         }
                         if (validateEmail(email)) {
-                            var cookie = 'email=' + email + '/' + fname + '/' + lname;
-                            createCookie(cookie, 365);
+                            createCookie('email',email + '/' + fname + '/' + lname, 365);
                             <?php if($this->_modalSubscribe()): ?>
-                            createCookie('subscribe=true', 365);
+                            createCookie('subscribe','true', 365);
                             location.reload();
                             <?php else: ?>
                             win.close();
@@ -147,20 +147,19 @@
             return re.test(email);
         }
         function emailCookieExists() {
-            var cookie = document.cookie;
-            var cookieArr = cookie.split(';');
-            var cookieStored = false;
-            for (var i = 0; i < cookieArr.length; i++) {
-                if (cookieArr[i].indexOf('email=') > -1) {
-                    cookieStored = true;
-                }
+            if(Mage.Cookies.get('email')) {
+                return true
+            }
+            else {
+                return false
             }
-            return cookieStored;
         }
-        function createCookie(cookie, expirationInDays) {
+        function createCookie(name, value, expirationInDays) {
             var now = new Date();
             var expire = new Date(now.getTime() + (expirationInDays * 24 * 60) * 60000);//[(1 * 365 * 24 * 60) * 60000] == 1 year  -- (Years * Days * Hours * Minutes) * 60000
-            document.cookie = cookie + '; expires=' + expire + '; path=/';
+            //document.cookie = cookie + '; expires=' + expire + '; path=/';
+            Mage.Cookies.expires = expire;
+            Mage.Cookies.set(name,value);
         }
     </script>
 <?php endif; ?>
\ No newline at end of file
diff --git a/js/ebizmarts/mailchimp/campaignCatcher.js b/js/ebizmarts/mailchimp/campaignCatcher.js
index e617ef08e..fdebbb4cd 100755
--- a/js/ebizmarts/mailchimp/campaignCatcher.js
+++ b/js/ebizmarts/mailchimp/campaignCatcher.js
@@ -1,28 +1,25 @@
-
     function getCampaign() {
-        var params = location.search.substr(1).split('&');
-        var cookies = new Array();
-        for (var i = 0; i < params.length; i++) {
-            var cookie = params[i].split('=');
-            var key = cookie[0];
-            var val = cookie[1];
+        var urlparams = location.search.substr(1).split('&');
+        var params = new Array();
+        for (var i = 0; i < urlparams.length; i++) {
+            var param = urlparams[i].split('=');
+            var key = param[0];
+            var val = param[1];
             if (key && val) {
-                cookies[key] = val;
+                params[key] = val;
             }
         }
 
-        if (cookies['mc_cid']) {
-            createCookie('mailchimp_campaign_id=' + cookies['mc_cid'], 30);
+        if (params['mc_cid']) {
+            createCookie('mailchimp_campaign_id' , params['mc_cid'], 3600*3);
         }
-        // if (cookies['mc_eid']) {
-        //     createCookie('mailchimp_email_id=' + cookies['mc_eid'], 30);
-        // }
     }
 
-    function createCookie(cookie, expirationInDays) {
+    function createCookie(name, value, expirationInSec) {
         var now = new Date();
-        var expire = new Date(now.getTime() + (expirationInDays * 24 * 60) * 60000);//[(1 * 365 * 24 * 60) * 60000] == 1 year  -- (Years * Days * Hours * Minutes) * 60000
-        document.cookie = cookie + '; expires=' + expire + '; path=/';
+        var expire = new Date(now.getTime() + (expirationInSec * 1000));//[(1 * 365 * 24 * 60) * 60000] == 1 year  -- (Years * Days * Hours * Minutes) * 60000
+        Mage.Cookies.expires = expire;
+        Mage.Cookies.set(name,value);
     }
 
     if (document.loaded) {
diff --git a/lib/Ebizmarts/Mailchimp.php b/lib/Ebizmarts/Mailchimp.php
index 05acf6bd1..1c957ce7d 100755
--- a/lib/Ebizmarts/Mailchimp.php
+++ b/lib/Ebizmarts/Mailchimp.php
@@ -137,7 +137,7 @@ class Ebizmarts_Mailchimp
     const DELETE    = 'DELETE';
     const PUT       = 'PUT';
 
-    public function __construct($apiKey=null,$opts=array())
+    public function __construct($apiKey=null,$opts=array(),$userAgent=null)
     {
         if(!$apiKey)
         {
@@ -167,8 +167,12 @@ public function __construct($apiKey=null,$opts=array())
         if (isset($opts['CURLOPT_FOLLOWLOCATION']) && $opts['CURLOPT_FOLLOWLOCATION'] === true) {
             curl_setopt($this->_ch, CURLOPT_FOLLOWLOCATION, true);
         }
-
-        curl_setopt($this->_ch, CURLOPT_USERAGENT, 'Ebizmart-MailChimp-PHP/3.0.0');
+        if($userAgent) {
+            curl_setopt($this->_ch, CURLOPT_USERAGENT, $userAgent);
+        }
+        else {
+            curl_setopt($this->_ch, CURLOPT_USERAGENT, 'Ebizmart-MailChimp-PHP/3.0.0');
+        }
         curl_setopt($this->_ch, CURLOPT_HEADER, false);
         curl_setopt($this->_ch, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($this->_ch, CURLOPT_CONNECTTIMEOUT, 30);
@@ -258,7 +262,7 @@ public function call($url,$params,$method=Ebizmarts_Mailchimp::GET,$encodeJson=t
         $info = curl_getinfo($ch);
 
         $result = json_decode($response_body, true);
-
+        
 
         if(curl_error($ch))
         {
diff --git a/lib/Ebizmarts/Mailchimp/EcommerceCarts.php b/lib/Ebizmarts/Mailchimp/EcommerceCarts.php
index bf3deee4d..aa4350973 100644
--- a/lib/Ebizmarts/Mailchimp/EcommerceCarts.php
+++ b/lib/Ebizmarts/Mailchimp/EcommerceCarts.php
@@ -12,4 +12,23 @@
  */
 class Mailchimp_EcommerceCarts extends Mailchimp_Abstract
 {
+    /**
+     * @param $storeId              The store id.
+     * @param null $fields          A comma-separated list of fields to return. Reference parameters of sub-objects with dot notation.
+     * @param null $excludeFields   A comma-separated list of fields to exclude. Reference parameters of sub-objects with dot notation.
+     * @param null $count           The number of records to return.
+     * @param null $offset          The number of records from a collection to skip. Iterating over large collections with this parameter can be slow.
+     * @return mixed
+     * @throws Mailchimp_Error
+     * @throws Mailchimp_HttpError
+     */
+    public function getAll($storeId,$fields=null,$excludeFields=null,$count=null,$offset=null)
+    {
+        $_params = array();
+        if($fields) $_params['fields'] = $fields;
+        if($excludeFields) $_params['exclude_fields'] = $excludeFields;
+        if($count) $_params['count'] = $count;
+        if($offset) $_params['offset'] = $offset;
+        return $this->master->call('ecommerce/stores/'.$storeId.'/carts',$_params,Ebizmarts_Mailchimp::GET);
+    }
 }
\ No newline at end of file
diff --git a/lib/Ebizmarts/Mailchimp/EcommerceCustomers.php b/lib/Ebizmarts/Mailchimp/EcommerceCustomers.php
index d3b7f18d3..3fc2d30f2 100644
--- a/lib/Ebizmarts/Mailchimp/EcommerceCustomers.php
+++ b/lib/Ebizmarts/Mailchimp/EcommerceCustomers.php
@@ -77,6 +77,22 @@ public function get($storeId,$customerId,$fields=null,$excludeFields=null)
         return $this->master->call('ecommerce/stores/'.$storeId.'/customers/'.$customerId,$_params,Ebizmarts_Mailchimp::GET);
     }
 
+    /**
+     * @param $storeId              The store id.
+     * @param $customerEmail        The email for the customer of a store.
+     * @param null $fields          A comma-separated list of fields to return. Reference parameters of sub-objects with dot notation.
+     * @param null $excludeFields   A comma-separated list of fields to exclude. Reference parameters of sub-objects with dot notation.
+     * @return mixed
+     * @throws Mailchimp_Error
+     * @throws Mailchimp_HttpError
+     */
+    public function getByEmail($storeId,$customerEmail,$fields=null,$excludeFields=null)
+    {
+        $_params = array('email_address'=>$customerEmail);
+        if($fields) $_params['fields']= $fields;
+        if($excludeFields) $_params['exclude_fields'] = $excludeFields;
+        return $this->master->call('ecommerce/stores/'.$storeId.'/customers',$_params,Ebizmarts_Mailchimp::GET);
+    }
     /**
      * @param $storeId          The store id.
      * @param $customerId       A unique identifier for the customer.
diff --git a/lib/Ebizmarts/Mailchimp/ListsMembers.php b/lib/Ebizmarts/Mailchimp/ListsMembers.php
index d08aa2090..bbf632373 100644
--- a/lib/Ebizmarts/Mailchimp/ListsMembers.php
+++ b/lib/Ebizmarts/Mailchimp/ListsMembers.php
@@ -130,7 +130,7 @@ public function update($listId,$subscriberHash,$emailType=null,$status=null, $me
         if($language) $_params['language'] = $language;
         if($vip) $_params['vip'] = $vip;
         if($location) $_params['location'] = $location;
-        return $this->master->call('list/'.$listId.'/members/'.$subscriberHash,$_params,Ebizmarts_Mailchimp::PATCH);
+        return $this->master->call('lists/'.$listId.'/members/'.$subscriberHash,$_params,Ebizmarts_Mailchimp::PATCH);
     }
 
     /**
@@ -150,18 +150,18 @@ public function update($listId,$subscriberHash,$emailType=null,$status=null, $me
      * @throws Mailchimp_Error
      * @throws Mailchimp_HttpError
      */
-    public function addOrUpdate($listId,$subscriberHash,$emailType=null,$status, $mergeFields=null,$interests=null,$language=null,$vip=null,$location=null,
-                                $emailAddress,$statusIfNew=null)
+    public function addOrUpdate($listId,$subscriberHash,$emailType=null,$status=null, $mergeFields=null,$interests=null,$language=null,$vip=null,$location=null,
+                                $emailAddress,$statusIfNew)
     {
-        $_params = array('status'=>$status,'email_address'=>$emailAddress);
+        $_params = array('status'=>$statusIfNew,'email_address'=>$emailAddress);
         if($emailType) $_params['email_type'] = $emailType;
+        if($status) $_params['status'] = $status;
         if($mergeFields) $_params['merge_fields'] = $mergeFields;
         if($interests) $_params['interests'] = $interests;
         if($language) $_params['language'] = $language;
         if($vip) $_params['vip'] = $vip;
         if($location) $_params['location'] = $location;
-        if($statusIfNew) $_params['status_if_new'] = $statusIfNew;
-        return $this->master->call('list/'.$listId.'/members/'.$subscriberHash,$_params,Ebizmarts_Mailchimp::PUT);
+        return $this->master->call('lists/'.$listId.'/members/'.$subscriberHash,$_params,Ebizmarts_Mailchimp::PUT);
     }
 
     /**
@@ -173,6 +173,6 @@ public function addOrUpdate($listId,$subscriberHash,$emailType=null,$status, $me
      */
     public function delete($listId,$subscriberHash)
     {
-        return $this->master->call('list/'.$listId.'/members/'.$subscriberHash,null,Ebizmarts_Mailchimp::DELETE);
+        return $this->master->call('lists/'.$listId.'/members/'.$subscriberHash,null,Ebizmarts_Mailchimp::DELETE);
     }
 }
\ No newline at end of file
diff --git a/skin/adminhtml/default/default/images/ebizmarts/Logo_Ebizmarts.png b/skin/adminhtml/default/default/images/ebizmarts/Logo_Ebizmarts.png
deleted file mode 100644
index af95af075..000000000
Binary files a/skin/adminhtml/default/default/images/ebizmarts/Logo_Ebizmarts.png and /dev/null differ
diff --git a/skin/adminhtml/default/default/mailchimp/images/logo-freddie-monocolor-200.png b/skin/adminhtml/default/default/mailchimp/images/logo-freddie-monocolor-200.png
new file mode 100644
index 000000000..75dd16d43
Binary files /dev/null and b/skin/adminhtml/default/default/mailchimp/images/logo-freddie-monocolor-200.png differ