diff --git a/Block/Subscribe.php b/Block/Subscribe.php
index 1012a305..b43eaa3d 100644
--- a/Block/Subscribe.php
+++ b/Block/Subscribe.php
@@ -2,6 +2,9 @@
 
 namespace Ebizmarts\MailChimp\Block;
 
+use Magento\Customer\Model\Session;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Model\CustomerFactory;
 use Magento\Framework\View\Element\Template;
 use \Ebizmarts\MailChimp\Helper\Data as MailchimpHelper;
 
@@ -15,27 +18,66 @@ class Subscribe extends \Magento\Newsletter\Block\Subscribe
      * @var MailchimpHelper
      */
     protected $helper;
+    /**
+     * @var Session
+     */
+    private $customerSession;
+    /**
+     * @var CustomerRepositoryInterface
+     */
+    private $customerRepo;
+    /**
+     * @var CustomerFactory
+     */
+    private $customerFactory;
 
     /**
      * @param Template\Context $context
      * @param MailchimpHelper $helper
+     * @param Session $customerSession
+     * @param CustomerRepositoryInterface $customerRepo
+     * @param CustomerFactory $customerFactory
      * @param array $data
      */
     public function __construct(
         Template\Context $context,
         MailchimpHelper $helper,
+        Session $customerSession,
+        CustomerRepositoryInterface $customerRepo,
+        CustomerFactory $customerFactory,
         array $data = []
     )
     {
         parent::__construct($context, $data);
         $this->context = $context;
         $this->helper = $helper;
+        $this->customerSession = $customerSession;
+        $this->customerRepo = $customerRepo;
+        $this->customerFactory = $customerFactory;
     }
 
     public function getPopupUrl()
     {
-
         $storeId = $this->context->getStoreManager()->getStore()->getId();
         return $this->helper->getConfigValue(MailchimpHelper::XML_POPUP_URL,$storeId);
     }
-}
\ No newline at end of file
+    public function getFormActionUrl()
+    {
+        return $this->getUrl('mailchimp/subscriber/subscribe', ['_secure' => true]);
+    }
+    public function showMobilePhone()
+    {
+        $ret = true;
+        if ($this->customerSession->getCustomerId()) {
+            /**
+             * @var $customer \Magento\Customer\Model\Customer
+             */
+            $customer = $this->customerFactory->create()->load($this->customerSession->getCustomerId());
+            $mobilePhone = $customer->getData('mobile_phone');
+            if ($mobilePhone&&$mobilePhone!='') {
+                $ret = false;
+            }
+        }
+        return $ret;
+    }
+}
diff --git a/Controller/Subscriber/Subscribe.php b/Controller/Subscriber/Subscribe.php
new file mode 100644
index 00000000..2afde299
--- /dev/null
+++ b/Controller/Subscriber/Subscribe.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Ebizmarts\MailChimp\Controller\Subscriber;
+
+use Magento\Customer\Api\AccountManagementInterface as CustomerAccountManagement;
+use Magento\Customer\Model\Session;
+use Magento\Customer\Model\Url as CustomerUrl;
+use Magento\Framework\App\Action\Context;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\Validator\EmailAddress as EmailValidator;
+use Magento\Newsletter\Controller\Subscriber\NewAction as SubscriberController;
+use Magento\Newsletter\Model\SubscriberFactory;
+use Magento\Store\Model\StoreManagerInterface;
+
+class Subscribe extends SubscriberController implements HttpPostActionInterface
+{
+    private $session;
+    public function __construct(
+        Context $context,
+        SubscriberFactory $subscriberFactory,
+        Session $customerSession,
+        StoreManagerInterface $storeManager,
+        CustomerUrl $customerUrl,
+        CustomerAccountManagement $customerAccountManagement,
+        EmailValidator $emailValidator = null
+    )
+    {
+        $this->session = $customerSession;
+        parent::__construct($context, $subscriberFactory, $customerSession, $storeManager, $customerUrl, $customerAccountManagement,  $emailValidator);
+    }
+
+    public function execute()
+    {
+        if($this->getRequest()->isPost() && $this->getRequest()->getPost('phone')) {
+            $phone = (string)$this->getRequest()->getPost('phone');
+            $this->session->setPhone($phone);
+        }
+        return parent::execute();
+    }
+}
diff --git a/Controller/WebHook/Index.php b/Controller/WebHook/Index.php
index 9bb6131a..5aa7d193 100644
--- a/Controller/WebHook/Index.php
+++ b/Controller/WebHook/Index.php
@@ -52,7 +52,6 @@ public function __construct(
         \Ebizmarts\MailChimp\Model\MailChimpWebhookRequestFactory $chimpWebhookRequestFactory,
         \Magento\Framework\HTTP\PhpEnvironment\RemoteAddress $remoteAddress
     ) {
-    
         parent::__construct($context);
         $this->_resultFactory              = $context->getResultFactory();
         $this->_helper                      = $helper;
@@ -111,6 +110,8 @@ public function execute()
                     $this->_helper->log($request['data']);
                     $result->setHttpResponseCode(403);
                 }
+            } else {
+                $this->_helper->log("The two way is off");
             }
         } else {
             $this->_helper->log('An empty request comes from ip: '.$this->_remoteAddress->getRemoteAddress());
diff --git a/Cron/Webhook.php b/Cron/Webhook.php
index e4a37fd0..1a56672c 100644
--- a/Cron/Webhook.php
+++ b/Cron/Webhook.php
@@ -150,7 +150,8 @@ protected function _subscribe($data)
             if (count($storeIds) > 0) {
                 foreach ($storeIds as $storeId) {
                     $sub = $this->_subscriberFactory->create();
-                    $sub->setStoreId($storeId);
+                    $websiteId = $this->storeManager->getStore($storeId)->getWebsiteId();
+                    $sub->setStoreId($websiteId);
                     $sub->setSubscriberEmail($email);
                     $this->_subscribeMember($sub, \Magento\Newsletter\Model\Subscriber::STATUS_SUBSCRIBED);
                 }
@@ -247,7 +248,8 @@ protected function _profile($data)
 
                 $stores = $this->_helper->getMagentoStoreIdsByListId($listId);
                 if (count($stores)) {
-                    $subscriber->setStoreId($stores[0]);
+                    $websiteId = $this->storeManager->getStore($stores[0])->getWebsiteId();
+                    $subscriber->setStoreId($websiteId);
                     try {
                         $api = $this->_helper->getApi($stores[0]);
                         $member = $api->lists->members->get($listId, hash('md5', strtolower($email)));
diff --git a/Helper/Data.php b/Helper/Data.php
index 53f77ae4..6d90e219 100755
--- a/Helper/Data.php
+++ b/Helper/Data.php
@@ -11,11 +11,31 @@
 
 namespace Ebizmarts\MailChimp\Helper;
 
+use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Framework\App\ResourceConnection;
-use Magento\Framework\Exception\ValidatorException;
-use Magento\Store\Model\Store;
-use Symfony\Component\Config\Definition\Exception\Exception;
-
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\App\Cache\TypeListInterface;
+use Magento\Framework\App\Helper\Context;
+use Magento\Framework\Stdlib\DateTime\DateTime;
+use Magento\Framework\Locale\Resolver;
+use Magento\Framework\Serialize\Serializer\Json as JsonSerializer;
+use Magento\Framework\Module\ModuleList\Loader;
+use Magento\Framework\Encryption\Encryptor;
+use Magento\Directory\Api\CountryInformationAcquirerInterface;
+use Magento\Directory\Model\CountryFactory;
+use Magento\Customer\Model\Session;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Model\CustomerFactory;
+use Magento\Customer\Model\ResourceModel\Attribute\CollectionFactory as AttributeCollectionFactory;
+use Magento\Customer\Model\ResourceModel\Customer\CollectionFactory as CustomerCollectionFactory;
+use Magento\Newsletter\Model\ResourceModel\Subscriber\CollectionFactory as SubscriberCollectionFactory;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Config\Model\ResourceModel\Config;
+use Ebizmarts\MailChimp\Model\Logger\Logger;
+use Ebizmarts\MailChimp\Model\MailChimpSyncBatches;
+use Ebizmarts\MailChimp\Model\MailChimpStoresFactory;
+use Ebizmarts\MailChimp\Model\MailChimpStores;
+use Ebizmarts\MailChimp\Model\MailChimpInterestGroupFactory;
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
     const XML_PATH_ACTIVE            = 'mailchimp/general/active';
@@ -53,6 +73,8 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
     const XML_POPUP_FORM             = 'mailchimp/general/popup_form';
     const XML_POPUP_URL              = 'mailchimp/general/popup_url';
     const XML_CLEAN_ERROR_MONTHS     = 'mailchimp/ecommerce/clean_errors_months';
+    const XML_FOOTER_PHONE           = 'mailchimp/general/footer_phone';
+    const XML_FOOTER_MAP             = 'mailchimp/general/footer_phone_map';
 
     const ORDER_STATE_OK             = 'complete';
 
@@ -96,17 +118,13 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
 
     protected $counters = [];
     /**
-     * @var \Magento\Store\Model\StoreManagerInterface
+     * @var StoreManagerInterface
      */
     private $_storeManager;
     /**
-     * @var \Ebizmarts\MailChimp\Model\Logger\Logger
+     * @var Logger
      */
     private $_mlogger;
-    /**
-     * @var \Magento\Customer\Model\GroupRegistry
-     */
-    private $_groupRegistry;
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
      */
@@ -116,184 +134,164 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      */
     protected $_request;
     /**
-     * @var \Magento\Framework\App\State
-     */
-    private $_state;
-    /**
-     * @var \Magento\Framework\Module\ModuleList\Loader
+     * @var Loader
      */
     private $_loader;
     /**
-     * @var \Magento\Config\Model\ResourceModel\Config
+     * @var Config
      */
     private $_config;
     /**
      * @var \Mailchimp
      */
     private $_api;
-
-    /**
-     * @var \Magento\Customer\Model\ResourceModel\Customer\CustomerRepository
-     */
-    private $_customer;
     /**
-     * @var \Ebizmarts\MailChimp\Model\MailChimpSyncBatches
+     * @var MailChimpSyncBatches
      */
     private $_syncBatches;
     /**
-     * @var \Ebizmarts\MailChimp\Model\MailChimpStoresFactory
+     * @var MailChimpStoresFactory
      */
     private $_mailChimpStoresFactory;
     /**
-     * @var \Ebizmarts\MailChimp\Model\MailChimpStores
+     * @var MailChimpStores
      */
     private $_mailChimpStores;
     /**
-     * @var \Magento\Framework\Encryption\Encryptor
+     * @var Encryptor
      */
     private $_encryptor;
     /**
-     * @var \Magento\Newsletter\Model\ResourceModel\Subscriber\CollectionFactory
+     * @var SubscriberCollectionFactory
      */
     private $_subscriberCollection;
     /**
-     * @var \Magento\Customer\Model\ResourceModel\Customer\CollectionFactory
+     * @var CustomerCollectionFactory
      */
     private $_customerCollection;
-    private $_addressRepositoryInterface;
-    /**
-     * @var \Magento\Framework\DB\Adapter\AdapterInterface
-     */
-    private $connection;
     /**
-     * @var \Magento\Framework\App\ResourceConnection
+     * @var ResourceConnection
      */
     private $_resource;
     /**
-     * @var \Magento\Framework\App\Cache\TypeListInterface
+     * @var TypeListInterface
      */
     private $_cacheTypeList;
     /**
-     * @var \Magento\Customer\Model\ResourceModel\Attribute\CollectionFactory
+     * @var AttributeCollectionFactory
      */
     private $_attCollection;
     /**
-     * @var \Magento\Customer\Model\CustomerFactory
+     * @var CustomerRepositoryInterface
      */
-    protected $_customerFactory;
+    protected $_customerRepo;
     /**
-     * @var \Magento\Directory\Api\CountryInformationAcquirerInterface
+     * @var CountryInformationAcquirerInterface
      */
     protected $_countryInformation;
     /**
-     * @var \Ebizmarts\MailChimp\Model\MailChimpInterestGroupFactory
+     * @var MailChimpInterestGroupFactory
      */
     protected $_interestGroupFactory;
     /**
-     * @var \Magento\Framework\Stdlib\DateTime\DateTime
+     * @var DateTime
      */
     protected $_date;
     /**
-     * @var \Magento\Framework\App\DeploymentConfig
+     * @var DeploymentConfig
      */
     protected $_deploymentConfig;
     /**
-     * @var \Magento\Framework\Serialize\Serializer\Json
+     * @var JsonSerializer
      */
     protected $_serializer;
     /**
-     * @var \Magento\Directory\Model\CountryFactory
+     * @var Session
+     */
+    protected $customerSession;
+    /**
+     * @var CountryFactory
      */
     protected $countryFactory;
     /**
-     * @var \Magento\Framework\Locale\Resolver
+     * @var Resolver
      */
     protected $resolver;
     private $customerAtt    = null;
     private $addressAtt     = null;
     private $_mapFields     = null;
+    private $customerFactory;
 
     /**
-     * @param \Magento\Framework\App\Helper\Context $context
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Ebizmarts\MailChimp\Model\Logger\Logger $logger
-     * @param \Magento\Customer\Model\GroupRegistry $groupRegistry
-     * @param \Magento\Framework\App\State $state
-     * @param \Magento\Framework\Module\ModuleList\Loader $loader
-     * @param \Magento\Config\Model\ResourceModel\Config $config
+     * @param Context $context
+     * @param StoreManagerInterface $storeManager
+     * @param Logger $logger
+     * @param Loader $loader
+     * @param Config $config
      * @param \Mailchimp $api
-     * @param \Magento\Framework\App\Cache\TypeListInterface $cacheTypeList
-     * @param \Magento\Customer\Model\ResourceModel\CustomerRepository $customer
-     * @param \Ebizmarts\MailChimp\Model\MailChimpSyncBatches $syncBatches
-     * @param \Ebizmarts\MailChimp\Model\MailChimpStoresFactory $mailChimpStoresFactory
-     * @param \Ebizmarts\MailChimp\Model\MailChimpStores $mailChimpStores
-     * @param \Magento\Customer\Model\ResourceModel\Attribute\CollectionFactory $attCollection
-     * @param \Magento\Framework\Encryption\Encryptor $encryptor
-     * @param \Magento\Newsletter\Model\ResourceModel\Subscriber\CollectionFactory $subscriberCollection
-     * @param \Magento\Customer\Model\ResourceModel\Customer\CollectionFactory $customerCollection
-     * @param \Magento\Customer\Api\AddressRepositoryInterface $addressRepositoryInterface
-     * @param \Magento\Customer\Model\CustomerFactory $customerFactory
-     * @param \Magento\Directory\Api\CountryInformationAcquirerInterface $countryInformation
+     * @param TypeListInterface $cacheTypeList
+     * @param MailChimpSyncBatches $syncBatches
+     * @param MailChimpStoresFactory $mailChimpStoresFactory
+     * @param MailChimpStores $mailChimpStores
+     * @param AttributeCollectionFactory $attCollection
+     * @param Encryptor $encryptor
+     * @param SubscriberCollectionFactory $subscriberCollection
+     * @param CustomerCollectionFactory $customerCollection
+     * @param CustomerRepositoryInterface $customerRepository
+     * @param CountryInformationAcquirerInterface $countryInformation
      * @param ResourceConnection $resource
-     * @param \Ebizmarts\MailChimp\Model\MailChimpInterestGroupFactory $interestGroupFactory
-     * @param \Magento\Framework\Serialize\Serializer\Json $serializer
-     * @param \Magento\Framework\App\DeploymentConfig $deploymentConfig
-     * @param \Magento\Framework\Stdlib\DateTime\DateTime $date
-     * @param \Magento\Directory\Model\CountryFactory $countryFactory
-     * @param \Magento\Framework\Locale\Resolver $resolver
+     * @param MailChimpInterestGroupFactory $interestGroupFactory
+     * @param JsonSerializer $serializer
+     * @param DeploymentConfig $deploymentConfig
+     * @param DateTime $date
+     * @param CountryFactory $countryFactory
+     * @param Resolver $resolver
+     * @param Session $customerSession
      */
     public function __construct(
-        \Magento\Framework\App\Helper\Context $context,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Ebizmarts\MailChimp\Model\Logger\Logger $logger,
-        \Magento\Customer\Model\GroupRegistry $groupRegistry,
-        \Magento\Framework\App\State $state,
-        \Magento\Framework\Module\ModuleList\Loader $loader,
-        \Magento\Config\Model\ResourceModel\Config $config,
+        Context $context,
+        StoreManagerInterface $storeManager,
+        Logger $logger,
+        Loader $loader,
+        Config $config,
         \Mailchimp $api,
-        \Magento\Framework\App\Cache\TypeListInterface $cacheTypeList,
-        \Magento\Customer\Model\ResourceModel\CustomerRepository $customer,
-        \Ebizmarts\MailChimp\Model\MailChimpSyncBatches $syncBatches,
-        \Ebizmarts\MailChimp\Model\MailChimpStoresFactory $mailChimpStoresFactory,
-        \Ebizmarts\MailChimp\Model\MailChimpStores $mailChimpStores,
-        \Magento\Customer\Model\ResourceModel\Attribute\CollectionFactory $attCollection,
-        \Magento\Framework\Encryption\Encryptor $encryptor,
-        \Magento\Newsletter\Model\ResourceModel\Subscriber\CollectionFactory $subscriberCollection,
-        \Magento\Customer\Model\ResourceModel\Customer\CollectionFactory $customerCollection,
-        \Magento\Customer\Api\AddressRepositoryInterface $addressRepositoryInterface,
-        \Magento\Customer\Model\CustomerFactory $customerFactory,
-        \Magento\Directory\Api\CountryInformationAcquirerInterface $countryInformation,
-        \Magento\Framework\App\ResourceConnection $resource,
-        \Ebizmarts\MailChimp\Model\MailChimpInterestGroupFactory $interestGroupFactory,
-        \Magento\Framework\Serialize\Serializer\Json $serializer,
-        \Magento\Framework\App\DeploymentConfig $deploymentConfig,
-        \Magento\Framework\Stdlib\DateTime\DateTime $date,
-        \Magento\Directory\Model\CountryFactory $countryFactory,
-        \Magento\Framework\Locale\Resolver $resolver
+        TypeListInterface $cacheTypeList,
+        MailChimpSyncBatches $syncBatches,
+        MailChimpStoresFactory $mailChimpStoresFactory,
+        MailChimpStores $mailChimpStores,
+        AttributeCollectionFactory $attCollection,
+        Encryptor $encryptor,
+        SubscriberCollectionFactory $subscriberCollection,
+        CustomerCollectionFactory $customerCollection,
+        CustomerRepositoryInterface $customerRepository,
+        CountryInformationAcquirerInterface $countryInformation,
+        ResourceConnection $resource,
+        MailChimpInterestGroupFactory $interestGroupFactory,
+        JsonSerializer $serializer,
+        DeploymentConfig $deploymentConfig,
+        DateTime $date,
+        CountryFactory $countryFactory,
+        Resolver $resolver,
+        Session $customerSession,
+        CustomerFactory $customerFactory
     ) {
-
         $this->_storeManager  = $storeManager;
         $this->_mlogger       = $logger;
-        $this->_groupRegistry = $groupRegistry;
         $this->_scopeConfig   = $context->getScopeConfig();
         $this->_request       = $context->getRequest();
-        $this->_state         = $state;
         $this->_loader        = $loader;
         $this->_config        = $config;
         $this->_api           = $api;
-        $this->_customer      = $customer;
         $this->_syncBatches             = $syncBatches;
         $this->_mailChimpStores         = $mailChimpStores;
         $this->_mailChimpStoresFactory  = $mailChimpStoresFactory;
         $this->_encryptor               = $encryptor;
         $this->_subscriberCollection    = $subscriberCollection;
         $this->_customerCollection      = $customerCollection;
-        $this->_addressRepositoryInterface = $addressRepositoryInterface;
         $this->_resource                = $resource;
-        $this->connection               = $resource->getConnection();
         $this->_cacheTypeList           = $cacheTypeList;
         $this->_attCollection           = $attCollection;
-        $this->_customerFactory         = $customerFactory;
+        $this->_customerRepo            = $customerRepository;
         $this->_countryInformation      = $countryInformation;
         $this->_interestGroupFactory    = $interestGroupFactory;
         $this->_serializer              = $serializer;
@@ -301,6 +299,8 @@ public function __construct(
         $this->_date                    = $date;
         $this->countryFactory           = $countryFactory;
         $this->resolver                 = $resolver;
+        $this->customerSession          = $customerSession;
+        $this->customerFactory          = $customerFactory;
         parent::__construct($context);
     }
 
@@ -419,7 +419,7 @@ private function getAddressAtt()
                 $ret[$item] = [
                     'attCode'   => $item,
                     'isDate'    => false,
-                    'isAddress' => false,
+                    'isAddress' => true,
                     'options'   => []
                 ];
             }
@@ -780,23 +780,38 @@ private function _getAddressValues(\Magento\Customer\Model\Address\AbstractAddre
     public function getMergeVarsBySubscriber(\Magento\Newsletter\Model\Subscriber $subscriber, $email = null)
     {
         $mergeVars = [];
-        $storeId = $subscriber->getStoreId();
-        $webSiteId = $this->getWebsiteId($subscriber->getStoreId());
+        $webSiteId = $subscriber->getStoreId();
+        if ($this->getConfigValue(self::XML_FOOTER_PHONE, $webSiteId, "websites")) {
+            $phone_field = $this->getConfigValue(self::XML_FOOTER_MAP , $webSiteId, "websites");
+            $phone = $subscriber->getPhone();
+            if ($phone_field && $phone) {
+                $mergeVars[$phone_field] = $phone;
+            }
+        }
         if (!$email) {
             $email = $subscriber->getEmail();
         }
-        try {
-            /**
-             * @var $customer \Magento\Customer\Model\Customer
-             */
-            $customer = $this->_customerFactory->create();
-            $customer->setWebsiteId($webSiteId);
-            $customer->loadByEmail($email);
-            if ($customer->getData('email') == $email) {
-                $mergeVars = $this->getMergeVars($customer, $storeId);
+        if ($this->customerSession->getCustomerId()) {
+            try {
+                /**
+                 * @var $customer CustomerInterface
+                 */
+                //$customer = $this->_customerRepo->getById($this->customerSession->getCustomerId());
+                $customer = $this->customerFactory->create()->load($this->customerSession->getCustomerId());
+                $this->log("Customer ".$customer->getId());
+                if ($customer->getData('mobile_phone')) {
+                    $this->log($customer->getData('mobile_phone'));
+                } else {
+                    $this->log('no mobile phone');
+                }
+                if ($customer->getData('email') == $email) {
+                    $mergeVars = array_merge($mergeVars, $this->getMergeVars($customer, $customer->getStoreId()));
+                }
+            } catch (\Exception $e) {
+                $this->log($e->getMessage());
             }
-        } catch (\Exception $e) {
-            $this->log($e->getMessage());
+        } else {
+            $this->log("Subscriber is not a customer");
         }
         return $mergeVars;
     }
@@ -1031,12 +1046,15 @@ public function deleteWebHook($apikey, $listId)
     public function loadListSubscribers($listId, $mail)
     {
         $collection = null;
+        $websiteIds = [];
         $storeIds = $this->getMagentoStoreIdsByListId($listId);
-        $storeIds[] = 0;
-        if (count($storeIds) > 0) {
+        foreach($storeIds as $storeId) {
+            $websiteIds[] =$this->_storeManager->getStore($storeId)->getWebsiteId();
+        }
+        if (count($websiteIds) > 0) {
             $collection = $this->_subscriberCollection->create();
             $collection
-                ->addFieldToFilter('store_id', ['in'=>$storeIds])
+                ->addFieldToFilter('store_id', ['in'=>$websiteIds])
                 ->addFieldToFilter('subscriber_email', ['eq'=>$mail]);
         }
         return $collection;
diff --git a/Model/Config/Source/Maps.php b/Model/Config/Source/Maps.php
new file mode 100644
index 00000000..3149c708
--- /dev/null
+++ b/Model/Config/Source/Maps.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace Ebizmarts\MailChimp\Model\Config\Source;
+
+use Magento\Framework\Data\OptionSourceInterface;
+use Ebizmarts\MailChimp\Helper\Data as MailchimpHelper;
+use Magento\Framework\App\RequestInterface;
+class Maps implements OptionSourceInterface
+{
+    private $options = null;
+    public function __construct(
+        RequestInterface $request,
+        MailchimpHelper $helper
+    )
+    {
+        $storeId = (int) $request->getParam("store", 0);
+        if ($request->getParam('website', 0)) {
+            $scope = 'website';
+            $storeId = $request->getParam('website', 0);
+        } elseif ($request->getParam('store', 0)) {
+            $scope = 'stores';
+            $storeId = $request->getParam('store', 0);
+        } else {
+            $scope = 'default';
+        }
+
+        if ($helper->getApiKey($storeId, $scope)) {
+            try {
+                $this->options = $helper->getApi($storeId, $scope)->lists->mergeFields->getAll(
+                    $helper->getConfigValue(\Ebizmarts\MailChimp\Helper\Data::XML_PATH_LIST, $storeId, $scope),
+                    null,
+                    null,
+                    MailchimpHelper::MAX_MERGEFIELDS
+                );
+            } catch (\Mailchimp_Error $e) {
+                $helper->log($e->getFriendlyMessage());
+            }
+        }
+
+    }
+    public function toOptionArray()
+    {
+        if (is_array($this->options)&&key_exists('merge_fields', $this->options)) {
+            $rc = [];
+            foreach ($this->options['merge_fields'] as $item) {
+                $rc[$item['tag']] = $item['tag'] . ' (' . $item['name'] . ' : ' . $item['type'] . ')';
+            }
+        } else {
+            $rc[] = ['value' => 0, 'label' => __('---No Data---')];
+        }
+        return $rc;
+    }
+}
diff --git a/Model/Plugin/Subscriber.php b/Model/Plugin/Subscriber.php
index a3fec41b..36aa9f06 100644
--- a/Model/Plugin/Subscriber.php
+++ b/Model/Plugin/Subscriber.php
@@ -17,89 +17,238 @@ class Subscriber
      * @var \Ebizmarts\MailChimp\Helper\Data
      */
     protected $_helper;
+    /**
+     * @var \Magento\Customer\Model\Customer
+     */
+    protected $_customer;
+    /**
+     * @var \Magento\Customer\Model\Session
+     */
+    protected $_customerSession;
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
-
+    /**
+     * @param \Ebizmarts\MailChimp\Helper\Data $helper
+     * @param \Magento\Customer\Model\ResourceModel\CustomerRepository $customer
+     * @param \Magento\Customer\Model\Session $customerSession
+     */
     protected $_api = null;
 
     /**
      * Subscriber constructor.
      * @param \Ebizmarts\MailChimp\Helper\Data $helper
+     * @param \Magento\Customer\Model\ResourceModel\CustomerRepository $customer
+     * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      */
     public function __construct(
         \Ebizmarts\MailChimp\Helper\Data $helper,
+        \Magento\Customer\Model\ResourceModel\CustomerRepository $customer,
+        \Magento\Customer\Model\Session $customerSession,
         \Magento\Store\Model\StoreManagerInterface $storeManager
     ) {
-    
+
         $this->_helper          = $helper;
+        $this->_customer        = $customer;
+        $this->_customerSession = $customerSession;
         $this->_storeManager    = $storeManager;
     }
 
     /**
      * @param \Magento\Newsletter\Model\Subscriber $subscriber
-     * @return null
+     * @param $customerId
+     * @return array
      * @throws \Magento\Framework\Exception\LocalizedException
      */
-    public function afterDelete(
-        \Magento\Newsletter\Model\Subscriber $subscriber
+    public function beforeUnsubscribeCustomerById(
+        \Magento\Newsletter\Model\Subscriber $subscriber,
+                                             $customerId
     ) {
-
-        $storeId = $this->getStoreIdFromSubscriber($subscriber);
+        $storeId = $this->_storeManager->getStore()->getId();
         if ($this->_helper->isMailChimpEnabled($storeId)) {
-            $api = $this->_helper->getApi($storeId);
+            if (!$this->_helper->getConfigValue(\Ebizmarts\MailChimp\Helper\Data::XML_MAGENTO_MAIL, $storeId)) {
+                $subscriber->setImportMode(true);
+            }
+            $subscriber->loadByCustomerId($customerId);
             if ($subscriber->isSubscribed()) {
+                $api = $this->_helper->getApi($storeId);
                 try {
                     $md5HashEmail = hash('md5', strtolower($subscriber->getSubscriberEmail()));
-                    if ($subscriber->getCustomerId()) {
-                        $api->lists->members->update(
+                    $api->lists->members->update(
+                        $this->_helper->getDefaultList($storeId),
+                        $md5HashEmail,
+                        null,
+                        'unsubscribed'
+                    );
+                } catch (\Mailchimp_Error $e) {
+                    $this->_helper->log($e->getFriendlyMessage());
+                }
+            }
+        }
+        return [$customerId];
+    }
+
+    /**
+     * @param \Magento\Newsletter\Model\Subscriber $subscriber
+     * @param $customerId
+     * @return array
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function beforeSubscribeCustomerById(
+        \Magento\Newsletter\Model\Subscriber $subscriber,
+                                             $customerId
+    ) {
+        $storeId = $this->_storeManager->getStore()->getId();
+        if ($this->_helper->isMailChimpEnabled($storeId)) {
+            $subscriber->loadByCustomerId($customerId);
+            if (!$subscriber->isSubscribed()) {
+                if (!$this->_helper->getConfigValue(\Ebizmarts\MailChimp\Helper\Data::XML_MAGENTO_MAIL, $storeId)) {
+                    $subscriber->setImportMode(true);
+                }
+                if ($this->_helper->isMailChimpEnabled($storeId)) {
+                    $customer = $this->_customer->getById($customerId);
+                    $email = $customer->getEmail();
+                    $mergeVars = $this->_helper->getMergeVarsBySubscriber($subscriber, $email);
+                    $api = $this->_helper->getApi($storeId);
+                    if ($this->_helper->isDoubleOptInEnabled($storeId)) {
+                        $status = 'pending';
+                    } else {
+                        $status = 'subscribed';
+                    }
+                    try {
+                        $emailHash = hash('md5', strtolower($customer->getEmail()));
+                        $api->lists->members->addOrUpdate(
                             $this->_helper->getDefaultList($storeId),
-                            $md5HashEmail,
+                            $emailHash,
                             null,
-                            'unsubscribed'
+                            $status,
+                            $mergeVars,
+                            null,
+                            null,
+                            null,
+                            null,
+                            $email,
+                            $status
                         );
-                    } else {
-                        $api->lists->members->delete($this->_helper->getDefaultList($storeId), $md5HashEmail);
+                    } catch (\Mailchimp_Error $e) {
+                        $this->_helper->log($e->getFriendlyMessage());
                     }
+                }
+            }
+        }
+        return [$customerId];
+    }
+
+    /**
+     * @param \Magento\Newsletter\Model\Subscriber $subscriber
+     * @param $email
+     * @return array
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function beforeSubscribe(
+        \Magento\Newsletter\Model\Subscriber $subscriber,
+                                             $email
+    ) {
+        $storeId = $this->_storeManager->getStore()->getId();
+        if ($this->_helper->isMailChimpEnabled($storeId)) {
+            if (!$this->_helper->getConfigValue(\Ebizmarts\MailChimp\Helper\Data::XML_MAGENTO_MAIL, $storeId)) {
+                $subscriber->setImportMode(true);
+            }
+            if ($this->_customerSession->getPhone()) {
+                $subscriber->setPhone($this->_customerSession->getPhone());
+            }
+
+            if ($this->_helper->isMailChimpEnabled($storeId)) {
+                $api = $this->_helper->getApi($storeId);
+                if ($this->_helper->isDoubleOptInEnabled($storeId)) {
+                    $status = 'pending';
+                } else {
+                    $status = 'subscribed';
+                }
+                $mergeVars = $this->_helper->getMergeVarsBySubscriber($subscriber, $email);
+                try {
+                    $md5HashEmail = hash('md5', strtolower($email));
+                    $return = $api->lists->members->addOrUpdate(
+                        $this->_helper->getDefaultList($storeId),
+                        $md5HashEmail,
+                        null,
+                        $status,
+                        $mergeVars,
+                        null,
+                        null,
+                        null,
+                        null,
+                        $email,
+                        $status
+                    );
                 } catch (\Mailchimp_Error $e) {
                     $this->_helper->log($e->getFriendlyMessage());
                 }
             }
         }
-        return null;
+        return [$email];
     }
 
     /**
      * @param \Magento\Newsletter\Model\Subscriber $subscriber
-     * @return int
+     * @return null
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
-    protected function getStoreIdFromSubscriber(\Magento\Newsletter\Model\Subscriber $subscriber)
-    {
-        return $subscriber->getStoreId();
+    public function beforeUnsubscribe(
+        \Magento\Newsletter\Model\Subscriber $subscriber
+    ) {
+        $storeId = $this->_storeManager->getStore()->getId();
+        if ($this->_helper->isMailChimpEnabled($storeId)) {
+            if (!$this->_helper->getConfigValue(\Ebizmarts\MailChimp\Helper\Data::XML_MAGENTO_MAIL, $storeId)) {
+                $subscriber->setImportMode(true);
+            }            $api = $this->_helper->getApi($storeId);
+            try {
+                $md5HashEmail = hash('md5', strtolower($subscriber->getSubscriberEmail()));
+                $api->lists->members->update(
+                    $this->_helper->getDefaultList($storeId),
+                    $md5HashEmail,
+                    null,
+                    'unsubscribed'
+                );
+            } catch (\Mailchimp_Error $e) {
+                $this->_helper->log($e->getFriendlyMessage());
+            }
+        }
     }
 
     /**
      * @param \Magento\Newsletter\Model\Subscriber $subscriber
-     * @param $email
-     * @param $websiteId
-     * @return \Magento\Newsletter\Model\Subscriber
+     * @return null
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
-    public function afterLoadBySubscriberEmail(\Magento\Newsletter\Model\Subscriber $subscriber, $email, $websiteId)
-    {
-        if ($this->_helper->isMailChimpEnabled($subscriber->getStoreId())) {
-            try {
-                if (!$this->_helper->getConfigValue(
-                    \Ebizmarts\MailChimp\Helper\Data::XML_MAGENTO_MAIL,
-                    $subscriber->getStoreId()
-                )) {
-                    $subscriber->setImportMode(true);
+    public function afterDelete(
+        \Magento\Newsletter\Model\Subscriber $subscriber
+    ) {
+        $storeId = $this->_storeManager->getStore()->getId();
+        if ($this->_helper->isMailChimpEnabled($storeId)) {
+            $api = $this->_helper->getApi($storeId);
+            if ($subscriber->isSubscribed()) {
+                try {
+                    $md5HashEmail = hash('md5', strtolower($subscriber->getSubscriberEmail()));
+                    if ($subscriber->getCustomerId()) {
+                        $api->lists->members->update(
+                            $this->_helper->getDefaultList($storeId),
+                            $md5HashEmail,
+                            null,
+                            'unsubscribed'
+                        );
+                    } else {
+                        $api->lists->members->delete($this->_helper->getDefaultList($storeId), $md5HashEmail);
+                    }
+                } catch (\Mailchimp_Error $e) {
+                    $this->_helper->log($e->getFriendlyMessage());
                 }
-            } catch (\Exception $exception) {
-                $this->_helper->log($exception->getMessage());
             }
         }
-        return $subscriber;
+        return null;
     }
 }
diff --git a/Model/Plugin/SubscriptionManager.php b/Model/Plugin/SubscriptionManager.php
index 4f75c03b..5ea8f7d8 100644
--- a/Model/Plugin/SubscriptionManager.php
+++ b/Model/Plugin/SubscriptionManager.php
@@ -162,6 +162,9 @@ public function beforeSubscribe(
             $websiteId = (int)$this->_storeManager->getStore($storeId)->getWebsiteId();
 
             $subscriber = $this->_subscriberFactory->create()->loadBySubscriberEmail($email, $websiteId);
+            if ($this->_customerSession->getPhone()) {
+                $subscriber->setPhone($this->_customerSession->getPhone());
+            }
 
             if ($this->_helper->isMailChimpEnabled($storeId)) {
                 $api = $this->_helper->getApi($storeId);
@@ -221,4 +224,4 @@ public function beforeUnsubscribe(
         }
         return [$email,$storeId,$confirmCode];
     }
- }
\ No newline at end of file
+ }
diff --git a/Model/ResourceModel/Newsletter/Collection.php b/Model/ResourceModel/Newsletter/Collection.php
new file mode 100644
index 00000000..b46d2560
--- /dev/null
+++ b/Model/ResourceModel/Newsletter/Collection.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Ebizmarts\MailChimp\Model\ResourceModel\Newsletter;
+
+class Collection extends \Magento\Newsletter\Model\ResourceModel\Subscriber\Collection
+{
+    protected function _initSelect()
+    {
+        parent::_initSelect();
+        $this->showCustomerInfo(true)->addSubscriberTypeField()->showStoreInfo();
+        $this->_map['fields']['phone'] = 'main_table.phone';
+        return $this;
+    }
+}
diff --git a/Observer/Subscriber/SaveBefore.php b/Observer/Subscriber/SaveBefore.php
new file mode 100644
index 00000000..a41ca31d
--- /dev/null
+++ b/Observer/Subscriber/SaveBefore.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Ebizmarts\MailChimp\Observer\Subscriber;
+
+use Magento\Framework\Event\Observer;
+use Magento\Customer\Model\Session;
+
+class SaveBefore implements \Magento\Framework\Event\ObserverInterface
+{
+    /**
+     * @var Session
+     */
+    private $customerSession;
+
+    /**
+     * @param Session $customerSession
+     */
+    public function __construct(
+        Session $customerSession
+    )
+    {
+        $this->customerSession = $customerSession;
+    }
+    public function execute(Observer $observer)
+    {
+        // TODO: Implement execute() method.
+        $subscriber = $observer->getSubscriber();
+        if ($this->customerSession->getPhone()) {
+            $subscriber->setPhone($this->customerSession->getPhone());
+            $this->customerSession->unsPhone();
+        }
+        return $subscriber;
+    }
+}
diff --git a/Setup/UpgradeData.php b/Setup/UpgradeData.php
index 1104997b..9a490ae8 100644
--- a/Setup/UpgradeData.php
+++ b/Setup/UpgradeData.php
@@ -18,7 +18,12 @@
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Sales\Model\OrderFactory;
+use Magento\Customer\Setup\CustomerSetupFactory;
+use Magento\Eav\Model\Entity\Attribute\SetFactory as AttributeSetFactory;
+use Magento\Eav\Model\Entity\Attribute\Set as AttributeSet;
+use Magento\Customer\Model\Customer;
 use Ebizmarts\MailChimp\Model\ResourceModel\MailChimpSyncEcommerce\CollectionFactory as SyncCollectionFactory;
+
 class UpgradeData implements UpgradeDataInterface
 {
     /**
@@ -53,17 +58,10 @@ class UpgradeData implements UpgradeDataInterface
      * @var OrderFactory
      */
     private $orderFactory;
+    protected $customerSetupFactory;
+    private $attributeSetFactory;
+
 
-    /**
-     * @param ResourceConnection $resource
-     * @param DeploymentConfig $deploymentConfig
-     * @param \Ebizmarts\MailChimp\Model\ResourceModel\MailChimpInterestGroup\CollectionFactory $interestGroupCollectionFactory
-     * @param \Ebizmarts\MailChimp\Model\ResourceModel\MailChimpWebhookRequest\CollectionFactory $webhookCollectionFactory
-     * @param \Magento\Config\Model\ResourceModel\Config\Data\CollectionFactory $configFactory
-     * @param SyncCollectionFactory $syncCollectionFactory
-     * @param OrderFactory $orderFactory
-     * @param \Ebizmarts\MailChimp\Helper\Data $helper
-     */
     public function __construct(
         ResourceConnection $resource,
         DeploymentConfig $deploymentConfig,
@@ -72,6 +70,8 @@ public function __construct(
         \Magento\Config\Model\ResourceModel\Config\Data\CollectionFactory $configFactory,
         SyncCollectionFactory $syncCollectionFactory,
         OrderFactory $orderFactory,
+        CustomerSetupFactory $customerSetupFactory,
+        AttributeSetFactory $attributeSetFactory,
         \Ebizmarts\MailChimp\Helper\Data $helper
     ) {
         $this->_resource            = $resource;
@@ -81,6 +81,8 @@ public function __construct(
         $this->configFactory                    = $configFactory;
         $this->syncCollectionFactory            = $syncCollectionFactory;
         $this->orderFactory                     = $orderFactory;
+        $this->customerSetupFactory = $customerSetupFactory;
+        $this->attributeSetFactory = $attributeSetFactory;
         $this->_helper              = $helper;
     }
 
@@ -186,5 +188,30 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
                 $config->getResource()->delete($config);
             }
         }
+        if (version_compare($context->getVersion(), '102.3.58')){
+            $customerSetup = $this->customerSetupFactory->create(['setup' => $setup]);
+            $customerEntity = $customerSetup->getEavConfig()->getEntityType('customer');
+            $attributeSetId = $customerEntity->getDefaultAttributeSetId();
+            /** @var $attributeSet AttributeSet */
+            $attributeSet = $this->attributeSetFactory->create();
+            $attributeGroupId = $attributeSet->getDefaultGroupId($attributeSetId);
+            $customerSetup->addAttribute(Customer::ENTITY, 'mobile_phone', [
+                'type' => 'varchar',
+                'label' => 'Mobile Phone',
+                'input' => 'text',
+                'required' => false,
+                'visible' => true,
+                'user_defined' => true,
+                'position' => 999,
+                'system' => 0,
+            ]);
+            $attribute = $customerSetup->getEavConfig()->getAttribute(Customer::ENTITY, 'mobile_phone')
+                ->addData([
+                    'attribute_set_id' => $attributeSetId,
+                    'attribute_group_id' => $attributeGroupId,
+                    'used_in_forms' => ['adminhtml_customer', 'customer_account_edit'],
+                ]);
+            $attribute->save();
+        }
     }
 }
diff --git a/Setup/UpgradeSchema.php b/Setup/UpgradeSchema.php
index d0c55dad..deb8fe01 100644
--- a/Setup/UpgradeSchema.php
+++ b/Setup/UpgradeSchema.php
@@ -30,7 +30,11 @@ class UpgradeSchema implements UpgradeSchemaInterface
      * @var DeploymentConfig
      */
     protected $_deploymentConfig;
-    public function __construct(ResourceConnection $resource, DeploymentConfig $deploymentConfig)
+
+    public function __construct(
+        ResourceConnection $resource,
+        DeploymentConfig $deploymentConfig
+    )
     {
         $this->_resource = $resource;
         $this->_deploymentConfig = $deploymentConfig;
@@ -753,5 +757,17 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con
                 'mailchimp_sent'
             );
         }
+        if (version_compare($context->getVersion(), '102.3.58') < 0) {
+            $connection->addColumn(
+                $setup->getTable('newsletter_subscriber'),
+                'phone',
+                [
+                    'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+                    'default' => null,
+                    'length' => 128,
+                    'comment' => 'Phone'
+                ]
+            );
+        }
     }
 }
diff --git a/etc/adminhtml/di.xml b/etc/adminhtml/di.xml
new file mode 100644
index 00000000..92ba3c1f
--- /dev/null
+++ b/etc/adminhtml/di.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Ebizmarts_MailChimp Magento JS component
+ *
+ * @category    Ebizmarts
+ * @package     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)
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <preference for="Magento\Newsletter\Model\ResourceModel\Subscriber\Grid\Collection" type="Ebizmarts\MailChimp\Model\ResourceModel\Newsletter\Collection" />
+</config>
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index 7b8b9e5b..2c73fc82 100644
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -69,7 +69,7 @@
                     </depends>
                 </field>
                 <field id="popup_form" translate="label" type="select" sortOrder="42" showInStore="1" showInWebsite="1" showInDefault="1">
-                    <label>Change the footer link</label>
+                    <label>Popup footer</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <comment>Enabling this, the "Subscribe" button at the bottom open a popup with the Mailchimp subscription form</comment>
                     <depends>
@@ -84,6 +84,22 @@
                         <field id="*/*/popup_form">1</field>
                     </depends>
                 </field>
+                <field id="footer_phone" translate="label" type="select" sortOrder="44" showInStore="1" showInWebsite="1" showInDefault="1">
+                    <label>Add the phone in the footer</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                    <comment></comment>
+                    <depends>
+                        <field id="*/*/active">1</field>
+                    </depends>
+                </field>
+                <field id="footer_phone_map" translate="label" type="select" sortOrder="45" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <label>Mailchimp map for phone</label>
+                    <source_model>Ebizmarts\MailChimp\Model\Config\Source\Maps</source_model>
+                    <depends>
+                        <field id="*/*/active">1</field>
+                        <field id="*/*/footer_phone">1</field>
+                    </depends>
+                </field>
                 <field id="magentoemail" translate="label" type="select" sortOrder="45" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Magento always manage emails</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
diff --git a/etc/events.xml b/etc/events.xml
index 0e7e46b1..1ff8bb10 100644
--- a/etc/events.xml
+++ b/etc/events.xml
@@ -26,6 +26,9 @@
     <event name="newsletter_subscriber_save_after">
         <observer name="mailchimp_newsletter_subscriber_save_after" instance="\Ebizmarts\MailChimp\Observer\Subscriber\SaveAfter" />
     </event>
+    <event name="newsletter_subscriber_save_before">
+        <observer name="mailchimp_newsletter_subscriber_save_before" instance="\Ebizmarts\MailChimp\Observer\Subscriber\SaveBefore" />
+    </event>
     <event name="catalog_product_import_bunch_save_after">
         <observer name="mailchimp_product_import" instance="\Ebizmarts\MailChimp\Observer\Adminhtml\Product\ImportAfter"/>
     </event>
diff --git a/etc/module.xml b/etc/module.xml
index 10a9013b..b3761036 100644
--- a/etc/module.xml
+++ b/etc/module.xml
@@ -11,7 +11,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Ebizmarts_MailChimp" setup_version="102.3.57">
+    <module name="Ebizmarts_MailChimp" setup_version="102.3.58">
         <sequence>
             <module name="Magento_Newsletter"/>
             <module name="Magento_Sales"/>
diff --git a/view/adminhtml/layout/newsletter_subscriber_block.xml b/view/adminhtml/layout/newsletter_subscriber_block.xml
new file mode 100644
index 00000000..38b82da6
--- /dev/null
+++ b/view/adminhtml/layout/newsletter_subscriber_block.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <body>
+        <referenceBlock name="adminhtml.newslettrer.subscriber.grid.columnSet">
+            <block class="Magento\Backend\Block\Widget\Grid\Column" name="adminhtml.newslettrer.subscriber.grid.columnSet.name" as="name">
+                <arguments>
+                    <argument name="header" xsi:type="string" translate="true">Phone</argument>
+                    <argument name="index" xsi:type="string">phone</argument>
+                    <argument name="header_css_class" xsi:type="string">phone</argument>
+                    <argument name="column_css_class" xsi:type="string">phone</argument>
+                </arguments>
+            </block>
+        </referenceBlock>
+    </body>
+</page>
diff --git a/view/adminhtml/web/js/configapikey.js b/view/adminhtml/web/js/configapikey.js
index 69f49d51..05b72997 100644
--- a/view/adminhtml/web/js/configapikey.js
+++ b/view/adminhtml/web/js/configapikey.js
@@ -85,6 +85,20 @@ define(
                 if (ecommerceEnabled == 0 && abandonedCartEnabled == 1) {
                     self._changeAbandonedCart();
                 }
+                $('#mailchimp_general_popup_form').change(function () {
+                    var popupformEnabled = $('#mailchimp_general_popup_form').find(':selected').val();
+                    var footerphoneEnabled = $('#mailchimp_general_footer_phone').find(':selected').val();
+                    if (popupformEnabled == 1 && footerphoneEnabled == 1) {
+                        self._disableFooterPhone();
+                    }
+                });
+                $('#mailchimp_general_footer_phone').change(function () {
+                    var popupformEnabled = $('#mailchimp_general_popup_form').find(':selected').val();
+                    var footerphoneEnabled = $('#mailchimp_general_footer_phone').find(':selected').val();
+                    if (popupformEnabled == 1 && footerphoneEnabled == 1) {
+                        self._disablePopupForm();
+                    }
+                });
             },
             _changeEcommerce: function () {
                 var self = this;
@@ -397,6 +411,36 @@ define(
                         }
                     });
                 });
+            },
+            _disableFooterPhone: function () {
+                var tag = '#mailchimp_general_footer_phone'
+                $(tag).empty();
+                $(tag).append($('<option>', {
+                    value: "0",
+                    text: 'No',
+                    selected: "selected"
+                }));
+                $(tag).append($('<option>', {
+                    value: "1",
+                    text: 'Yes'
+                }));
+                $('#mailchimp_general_footer_phone_map').hide();
+                $('#row_mailchimp_general_footer_phone_map').hide();
+            },
+            _disablePopupForm: function () {
+                var tag = '#mailchimp_general_popup_form'
+                $(tag).empty();
+                $(tag).append($('<option>', {
+                    value: "0",
+                    text: 'No',
+                    selected: "selected"
+                }));
+                $(tag).append($('<option>', {
+                    value: "1",
+                    text: 'Yes'
+                }));
+                $('#mailchimp_general_popup_url').hide();
+                $('#row_mailchimp_general_popup_url').hide();
             }
         });
         return $.mage.configmonkeyapikey;
diff --git a/view/frontend/layout/default.xml b/view/frontend/layout/default.xml
index 61120fc4..7613f7e0 100644
--- a/view/frontend/layout/default.xml
+++ b/view/frontend/layout/default.xml
@@ -23,6 +23,9 @@
             <action method="setTemplate" ifconfig="mailchimp/general/popup_form">
                 <argument name="template" xsi:type="string">Ebizmarts_MailChimp::footer.phtml</argument>
             </action>
+            <action method="setTemplate" ifconfig="mailchimp/general/footer_phone">
+                <argument name="template" xsi:type="string">Ebizmarts_MailChimp::footerwphone.phtml</argument>
+            </action>
         </referenceBlock>
     </body>
 </page>
diff --git a/view/frontend/templates/footerwphone.phtml b/view/frontend/templates/footerwphone.phtml
new file mode 100644
index 00000000..c4b21a35
--- /dev/null
+++ b/view/frontend/templates/footerwphone.phtml
@@ -0,0 +1,48 @@
+<div class="block newsletter">
+    <div class="title"><strong><?= $block->escapeHtml(__('Newsletter')) ?></strong></div>
+    <div class="content">
+        <form class="form subscribe"
+              novalidate
+              action="<?= $block->escapeUrl($block->getFormActionUrl()) ?>"
+              method="post"
+              data-mage-init='{"validation": {"errorClass": "mage-error"}}'
+              id="newsletter-validate-detail">
+            <div class="field newsletter" style="display: inline-block">
+                <div class="control">
+                    <label for="newsletter">
+                        <span class="label">
+                            <?= $block->escapeHtml(__('Sign Up for Our Newsletter:')) ?>
+                        </span>
+                        <input name="email" type="email" id="newsletter"
+                               placeholder="<?= $block->escapeHtml(__('Enter your email address')) ?>"
+                               data-mage-init='{"mage/trim-input":{}}'
+                               data-validate="{required:true, 'validate-email':true}"
+                        />
+                        <input name="phone" type="tel" id="newsletter"
+                               placeholder="<?= $block->escapeHtml(__('Enter your SMS phone')) ?>"
+                               data-mage-init='{"mage/trim-input":{}}'
+                               data-validate="{required:false, 'validate-phoneStrict':false}"
+                        />
+                    </label>
+                </div>
+            </div>
+            <div class="actions">
+                <button class="action subscribe primary"
+                        title="<?= $block->escapeHtmlAttr(__('Subscribe')) ?>"
+                        type="submit"
+                        aria-label="Subscribe">
+                    <span><?= $block->escapeHtml(__('Subscribe')) ?></span>
+                </button>
+            </div>
+        </form>
+    </div>
+</div>
+<script type="text/x-magento-init">
+    {
+        "*": {
+            "Magento_Customer/js/block-submit-on-send": {
+                "formId": "newsletter-validate-detail"
+            }
+        }
+    }
+</script>