diff --git a/.gitignore b/.gitignore
new file mode 100755
index 0000000..ad0f5aa
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*.~
+error_log
+.gitignore
+.htaccess~
diff --git a/Block/System/Config/Form/Field/Precision.php b/Block/System/Config/Form/Field/Precision.php
new file mode 100755
index 0000000..c83dd6e
--- /dev/null
+++ b/Block/System/Config/Form/Field/Precision.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * @category   Evozon
+ * @package    Magento_Evozon
+ * @copyright  Copyright (c) 2018 Evozon (http://www.evozon.com)
+ * @author     Lilian Codreanu <lilian.codreanu@evozon.com>
+ */
+
+namespace Lillik\PriceDecimal\Block\System\Config\Form\Field;
+
+
+class Precision implements \Magento\Framework\Option\ArrayInterface
+{
+
+    /**
+     * Return array of options as value-label pairs
+     *
+     * @return array Format: array(array('value' => '<value>', 'label' => '<label>'), ...)
+     */
+    public function toOptionArray()
+    {
+        return [
+            ['value' => 0, 'label' => __('0')],
+            ['value' => 1, 'label' => __('1')],
+            ['value' => 2, 'label' => __('2')],
+            ['value' => 3, 'label' => __('3')],
+            ['value' => 4, 'label' => __('4')],
+        ];
+    }
+}
\ No newline at end of file
diff --git a/LICENSE.txt b/LICENSE.txt
old mode 100644
new mode 100755
diff --git a/Model/Config.php b/Model/Config.php
old mode 100644
new mode 100755
index 53a321f..71b73c0
--- a/Model/Config.php
+++ b/Model/Config.php
@@ -2,40 +2,46 @@
 /**
  *
  * @package Lillik\PriceDecimal\Model
- *
  * @author  Lilian Codreanu <lilian.codreanu@gmail.com>
+ * includes Roy Nilsson's modifications ( Aug 2020 ) 
+ * includes Patriboom's modifications   ( Mar 2021 ) 
  */
 
 namespace Lillik\PriceDecimal\Model;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\RequestInterface;
 
 class Config implements ConfigInterface
 {
 
-    const XML_PATH_PRICE_PRECISION
-        = 'catalog_price_decimal/general/price_precision';
+	const XML_PATH_GENERAL_ENABLE 			= 'catalog_price_decimal/general/enable';
+	const XML_PATH_CAN_SHOW_PRICE_DECIMAL 	= 'catalog_price_decimal/general/can_show_decimal';
+	const XML_PATH_DISABLE_FOR_ACTIONS 		= 'catalog_price_decimal/general/disable_for_actions';
 
-    const XML_PATH_CAN_SHOW_PRICE_DECIMAL
-        = 'catalog_price_decimal/general/can_show_decimal';
+	const XML_PATH_PRICE_PRECISION 			= 'catalog_price_decimal/general/price_precision';
+	const XML_PATH_PRICE_PRECISIONCART 		= 'catalog_price_decimal/general/price_precision';
+	const XML_PATH_PRICE_PRECISIONCHECKOUT = 'catalog_price_decimal/general/price_precision';
 
-    const XML_PATH_GENERAL_ENABLE
-        = 'catalog_price_decimal/general/enable';
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
      */
     private $scopeConfig;
 
+	/**
+     * @var \Magento\Framework\App\RequestInterface
+     */
+    private $request;
+    
     /**
      * @param ScopeConfigInterface $scopeConfig
      */
-    public function __construct(
-        ScopeConfigInterface $scopeConfig
-    ) {
-
+    public function __construct( ScopeConfigInterface $scopeConfig, RequestInterface $request ) 
+		{
         $this->scopeConfig = $scopeConfig;
-    }
+        $this->request = $request;
+    	}
 
     /**
      * @return \Magento\Framework\App\Config\ScopeConfigInterface
@@ -48,12 +54,13 @@ public function getScopeConfig()
     /**
      * Return Config Value by XML Config Path
      * @param $path
+     * @param $scopeType
      *
      * @return mixed
      */
-    public function getValueByPath($path)
+    public function getValueByPath($path, $scopeType = 'website')
     {
-        return $this->getScopeConfig()->getValue($path);
+        return $this->getScopeConfig()->getValue($path, $scopeType);
     }
 
     /**
@@ -61,7 +68,8 @@ public function getValueByPath($path)
      */
     public function isEnable()
     {
-        return $this->getValueByPath(self::XML_PATH_GENERAL_ENABLE);
+      //return $this->getValueByPath(self::XML_PATH_GENERAL_ENABLE, 'website');
+		return $this->getValueByPath(self::XML_PATH_GENERAL_ENABLE, 'website') && !$this->isDisabledForAction(); 
     }
 
     /**
@@ -69,7 +77,7 @@ public function isEnable()
      */
     public function canShowPriceDecimal()
     {
-        return $this->getValueByPath(self::XML_PATH_CAN_SHOW_PRICE_DECIMAL);
+        return $this->getValueByPath(self::XML_PATH_CAN_SHOW_PRICE_DECIMAL, 'website');
     }
 
     /**
@@ -79,6 +87,25 @@ public function canShowPriceDecimal()
      */
     public function getPricePrecision()
     {
-        return $this->getValueByPath(self::XML_PATH_PRICE_PRECISION);
+        return $this->getValueByPath(self::XML_PATH_PRICE_PRECISION, 'website');
+    }
+    public function getPricePrecisionCart()
+    {
+        return $this->getValueByPath(self::XML_PATH_PRICE_PRECISIONCART, 'website');
+    }
+    public function getPricePrecisionCheckout()
+    {
+        return $this->getValueByPath(self::XML_PATH_PRICE_PRECISIONCHECKOUT, 'website');
+    }
+
+    private function isDisabledForAction()
+    {
+        $currentAction = $this->request->getModuleName() . '_' . $this->request->getControllerName() . '_' . $this->request->getActionName();
+        foreach (explode(',', $this->getValueByPath(self::XML_PATH_DISABLE_FOR_ACTIONS, 'website')) as $action) {
+            if (trim($action) == $currentAction) {
+                return true;
+            }
+        }
+        return false;
     }
 }
diff --git a/Model/ConfigInterface.php b/Model/ConfigInterface.php
old mode 100644
new mode 100755
diff --git a/Model/Currency.php b/Model/Currency.php
new file mode 100755
index 0000000..9556047
--- /dev/null
+++ b/Model/Currency.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ *
+ * @package package Lillik\PriceDecimal
+ *
+ * @author  Lilian Codreanu <lilian.codreanu@gmail.com>
+ */
+
+namespace Lillik\PriceDecimal\Model;
+
+use Magento\Framework\CurrencyInterface;
+use Magento\Framework\Currency as MagentoCurrency;
+use Lillik\PriceDecimal\Model\ConfigInterface;
+
+/** @method getPricePrecision */
+class Currency extends MagentoCurrency implements CurrencyInterface
+{
+
+    use PricePrecisionConfigTrait;
+
+    /**
+     * @var \Lillik\PriceDecimal\Model\ConfigInterface
+     */
+    public $moduleConfig;
+
+    /**
+     * Currency constructor.
+     *
+     * @param \Magento\Framework\App\CacheInterface      $appCache
+     * @param \Lillik\PriceDecimal\Model\ConfigInterface $moduleConfig
+     * @param null                                       $options
+     * @param null                                       $locale
+     */
+    public function __construct(
+        \Magento\Framework\App\CacheInterface $appCache,
+        ConfigInterface $moduleConfig,
+        $options = null,
+        $locale = null
+    ) {
+        $this->moduleConfig = $moduleConfig;
+        parent::__construct($appCache, $options, $locale);
+    }
+}
diff --git a/Model/Plugin/Currency.php b/Model/Plugin/Currency.php
new file mode 100755
index 0000000..02127df
--- /dev/null
+++ b/Model/Plugin/Currency.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ *
+ * @package package Lillik\PriceDecimal\Model\Plugin\Local
+ *
+ * @author  Lilian Codreanu <lilian.codreanu@gmail.com>
+ */
+
+namespace Lillik\PriceDecimal\Model\Plugin;
+
+class Currency extends PriceFormatPluginAbstract
+{
+
+    /**
+     * {@inheritdoc}
+     *
+     * @param \Magento\Framework\CurrencyInterface $subject
+     * @param array                                ...$args
+     *
+     * @return array
+     */
+    public function beforeToCurrency(
+        \Lillik\PriceDecimal\Model\Currency $subject,
+        ...$arguments
+    ) {
+        if ($this->getConfig()->isEnable()) {
+            $arguments[1]['precision'] = $subject->getPricePrecision();
+        }
+        return $arguments;
+    }
+}
diff --git a/Model/Plugin/Local/Format.php b/Model/Plugin/Local/Format.php
old mode 100644
new mode 100755
index d957d09..93121f5
--- a/Model/Plugin/Local/Format.php
+++ b/Model/Plugin/Local/Format.php
@@ -26,8 +26,10 @@ public function afterGetPriceFormat($subject, $result)
         $precision = $this->getPricePrecision();
 
         if ($this->getConfig()->isEnable()) {
-            $result['precision'] = $precision;
-            $result['requiredPrecision'] = $precision;
+            $result['precision'] 			= $precision;
+            $result['precisionCart']  		= $this->getConfig()->getPricePrecisionCart();
+            $result['precisionCheckout'] 	= $this->getConfig()->getPricePrecisionCheckout();
+            $result['requiredPrecision'] 	= $precision;
         }
 
         return $result;
diff --git a/Model/Plugin/OrderPlugin.php b/Model/Plugin/OrderPlugin.php
new file mode 100755
index 0000000..e686ed8
--- /dev/null
+++ b/Model/Plugin/OrderPlugin.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ *
+ * @package Lillik\PriceDecimal\Model\Plugin
+ *
+ * @author  Lilian Codreanu <lilian.codreanu@gmail.com>
+ */
+
+namespace Lillik\PriceDecimal\Model\Plugin;
+
+class OrderPlugin extends PriceFormatPluginAbstract
+{
+    /**
+     * @param \Magento\Sales\Model\Order $subject
+     * @param array ...$args
+     * @return array
+     */
+    public function beforeFormatPricePrecision(
+        \Magento\Sales\Model\Order $subject,
+        ...$args
+    ) {
+        //is enabled
+        if ($this->getConfig()->isEnable()) {
+            //change the precision
+            $args[1] = $this->getPricePrecision();
+        }
+
+        return $args;
+    }
+}
diff --git a/Model/Plugin/PriceCurrency.php b/Model/Plugin/PriceCurrency.php
old mode 100644
new mode 100755
index 334beb9..b3508cb
--- a/Model/Plugin/PriceCurrency.php
+++ b/Model/Plugin/PriceCurrency.php
@@ -14,16 +14,77 @@ class PriceCurrency extends PriceFormatPluginAbstract
     /**
      * {@inheritdoc}
      */
-    public function aroundFormat(
+    public function beforeFormat(
+        \Magento\Directory\Model\PriceCurrency $subject,
+        ...$args
+    ) {
+        if ($this->getConfig()->isEnable()) {
+            // add the optional arg
+            if (!isset($args[1])) {
+                $args[1] = true;
+            }
+            // Precision argument
+            $args[2] = $this->getPricePrecision();
+        }
+
+        return $args;
+    }
+
+    /**
+     * @param \Magento\Directory\Model\PriceCurrency $subject
+     * @param callable $proceed
+     * @param $price
+     * @param array ...$args
+     * @return float
+     */
+    public function aroundRound(
         \Magento\Directory\Model\PriceCurrency $subject,
         callable $proceed,
+        $price,
         ...$args
     ) {
+        if ($this->getConfig()->isEnable()) {
+            return round($price, $this->getPricePrecision());
 
+        } else {
+            return $proceed($price);
+        }
+    }
+
+    /**
+     * @param \Magento\Directory\Model\PriceCurrency $subject
+     * @param array ...$args
+     * @return array
+     */
+    public function beforeConvertAndFormat(
+        \Magento\Directory\Model\PriceCurrency $subject,
+        ...$args
+    ) {
+        if ($this->getConfig()->isEnable()) {
+            // add the optional args
+            $args[1] = isset($args[1])? $args[1] : null;
+            $args[2] = intval($this->getPricePrecision());
+        }
+
+        return $args;
+    }
+
+    /**
+     * @param \Magento\Directory\Model\PriceCurrency $subject
+     * @param array ...$args
+     * @return array
+     */
+    public function beforeConvertAndRound(
+        \Magento\Directory\Model\PriceCurrency $subject,
+        ...$args
+    ) {
         if ($this->getConfig()->isEnable()) {
-            $args[2] = $this->getPricePrecision(); // Precision argument
+            //add optional args
+            $args[1] = isset($args[1])? $args[1] : null;
+            $args[2] = isset($args[2])? $args[2] : null;
+            $args[3] = $this->getPricePrecision();
         }
 
-        return $proceed(...$args);
+        return $args;
     }
 }
diff --git a/Model/Plugin/PriceFormatPluginAbstract.php b/Model/Plugin/PriceFormatPluginAbstract.php
old mode 100644
new mode 100755
index aee7b0d..bb107f7
--- a/Model/Plugin/PriceFormatPluginAbstract.php
+++ b/Model/Plugin/PriceFormatPluginAbstract.php
@@ -10,12 +10,15 @@
 namespace Lillik\PriceDecimal\Model\Plugin;
 
 use Lillik\PriceDecimal\Model\ConfigInterface;
+use Lillik\PriceDecimal\Model\PricePrecisionConfigTrait;
 
 abstract class PriceFormatPluginAbstract
 {
 
+    use PricePrecisionConfigTrait;
+
     /** @var ConfigInterface  */
-    private $moduleConfig;
+    protected $moduleConfig;
 
     /**
      * @param \Lillik\PriceDecimal\Model\ConfigInterface $moduleConfig
@@ -25,24 +28,4 @@ public function __construct(
     ) {
         $this->moduleConfig  = $moduleConfig;
     }
-
-    /**
-     * @return \Lillik\PriceDecimal\Model\ConfigInterface
-     */
-    public function getConfig()
-    {
-        return $this->moduleConfig;
-    }
-
-    /**
-     * @return int|mixed
-     */
-    public function getPricePrecision()
-    {
-        if ($this->getConfig()->canShowPriceDecimal()) {
-            return $this->getConfig()->getPricePrecision();
-        }
-
-        return 0;
-    }
 }
diff --git a/Model/PricePrecisionConfigTrait.php b/Model/PricePrecisionConfigTrait.php
new file mode 100755
index 0000000..db533af
--- /dev/null
+++ b/Model/PricePrecisionConfigTrait.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ *
+ * @package Lillik\PriceDecimal
+ *
+ * @author  Lilian Codreanu <lilian.codreanu@gmail.com>
+ */
+
+namespace Lillik\PriceDecimal\Model;
+
+trait PricePrecisionConfigTrait
+{
+
+		/**
+     * @$Val used to keep track of the way to count decimals
+     */
+	public $Val;
+	
+		/**
+     * @$requestUri used to know which page is calling function so, which value return to 
+     */
+	public $requestUri;
+
+    /**
+
+     * @return \Lillik\PriceDecimal\Model\ConfigInterface
+     */
+    public function getConfig()
+    {
+        return $this->moduleConfig;
+    }
+
+    /**
+     * Set the PAGE INFO string
+     *
+     * @param string|null $pathInfo
+     * @return $this
+     */
+    public function getPageInfo($pathInfo = null) 
+    {
+        if ($pathInfo === null) {
+            $requestUri = $this->getRequestUri();
+            if ($requestUri == '/') {
+                return $this;
+            }
+
+            // Remove the query string from REQUEST_URI
+            $pos = strpos($requestUri, '?');
+            if ($pos) {
+                $requestUri = substr($requestUri, 0, $pos);
+            }
+
+            $baseUrl = $this->getBaseUrl();
+            $pathInfo = substr($requestUri, strlen($baseUrl));
+            if (!empty($baseUrl) && '/' === $pathInfo) {
+                $pathInfo = '';
+            } elseif ($baseUrl === null) {
+                $pathInfo = $requestUri;
+            }
+            $pathInfo = ($pos !== false) ? substr($requestUri, $pos) : '';
+            $this->requestString = $pathInfo;
+        }
+        $this->pathInfo = ($pathInfo == '') ? array() : explode('/', $pathInfo);
+        return $this;
+    }
+
+    /**
+     * @return int|mixed
+     */
+    public function getPricePrecision()
+    {
+        if ($this->getConfig()->canShowPriceDecimal()) {
+        		//return $context->getLayout();
+        		$Val = $this->getConfig()->getPricePrecision(); 
+        		$Val =  (in_array('checkout', getPageInfo())) ? $this->getConfig()->getPricePrecisionCheckout() :  $Val;
+        		$Val =  (in_array('cart', getPageInfo()))  ? $this->getConfig()->getPricePrecisionCart() :  $Val;
+//        		$Val =  (strstr($_SERVER['PHP_SELF'], 'checkout') > -1 ) ? $this->getConfig()->getPricePrecisionCheckout() :  $Val;
+//        		$Val =  (strstr($_SERVER['PHP_SELF'], 'cart') > -1 ) ? $this->getConfig()->getPricePrecisionCart() :  $Val;
+            return $Val;
+        }
+        return 0;
+    }
+}
diff --git a/README.md b/README.md
old mode 100644
new mode 100755
index ed63e4c..54b3a30
--- a/README.md
+++ b/README.md
@@ -1,34 +1,53 @@
 
-### Introduction ###
+### Introduction
 The **«Price Decimal Precision»** Magento 2 extension allows a store administrator to setup a custom display decimal precision for the prices and other currency values (discounts, taxes, sales amounts, etc.) both for the frontend and the backend areas.
 The price display settings are individual per currency and per store.
 The extension supports an unlimited number of currencies.
 
-![alt text](https://i.imgsafe.org/0fdb0d517c.png "Magento 2 Price Decimal Precision")
+![alt text](http://res.cloudinary.com/dho2b9ukb/image/upload/v1506373635/general_config_mt9vi8.png "Magento 2 Price Decimal Precision")
 
 The **«Price Decimal Precision»** extension allows you to change or delete the decimal number (precision) in a price, that is displayed in the front office of your store. The extentension supports multi store and multi website configuration and can be useful in managing multiwebsites / multisore shops. The ** "Price Decimal Precision" ** extension is a free and fully configurable and  can be helpful for your business.
 
-### What can the extension do for you?###
-###### Remove decimal precision from price######
-![alt text](https://i.imgsafe.org/1002272a21.png "Magento 2 Price Decimal Precision")
-###### Price with one decimal precision######
-![alt text](https://i.imgsafe.org/1002352dc4.png "Magento 2 Price Decimal Precision")
+### What can the extension do for you?
+###### Remove decimal precision from price
+![](http://res.cloudinary.com/dho2b9ukb/image/upload/v1506373660/scren1-1_xcpn8p.png "Magento 2 Price Decimal Precision")
+###### Price with one decimal precision
+![](http://res.cloudinary.com/dho2b9ukb/image/upload/v1506373661/scren2-1_ahawtd.png "Magento 2 Price Decimal Precision")
 
-### Features ###
+### Features
 - Free and open source and fully configurable extension;
 - Easy to install and unistall;
 - Easy to configurate;
 - Remove or change the price precision from a specific website or store;
 - Supports English translation.
 
-### Installation ###
+### Installation
 The preferred way of installing lillik/magento2-price-decimal is through Composer. Simply add lillik/magento2-price-decimal as a dependency:
 
 ```bash
 php composer.phar require lillik/magento2-price-decimal
 ```
-### Contribution ###
+
+Other way to install: 
+- copy all files from here  ( green button "Code" )
+- use the way you want ( clone or Zip )
+- find you Magento directory ( look like  /var/www/html/MyRepositories/Magento/  or c:\MyFiles\MyWebSite\Magento  )
+- create in the previous directory the following sub-dir:  app/code/Lillik/PricDecimal
+- Copy the actual repository ( clone or unzip ) in /var/www/html/MyRepositories/Magento/app/code/Lillik/PriceDecimal 
+
+
+### Configuration
+
+```
+Stores -> Configuration -> Catalog
+```
+
+### Contribution
 If you have any issues, please [contact me](https://twitter.com/clipro) or open a bug report in GitHub's [issue tracker](https://github.com/lillik/magento2-price-decimal/issues).
 
-### License ###
+### License
 The code is licensed under [Apache-2.0 License](https://www.apache.org/licenses/LICENSE-2.0).
+
+### TODO 
+ - Remove decimals in cart and checkout
+ - Remove only zero decimal option ([description](https://github.com/lillik/magento2-price-decimal/issues/35))
diff --git a/Test/Unit/Plugin/Model/PriceCurrencyTest.php b/Test/Unit/Plugin/Model/PriceCurrencyTest.php
old mode 100644
new mode 100755
index f42f011..96e67a5
--- a/Test/Unit/Plugin/Model/PriceCurrencyTest.php
+++ b/Test/Unit/Plugin/Model/PriceCurrencyTest.php
@@ -12,7 +12,7 @@
 use Lillik\PriceDecimal\Model\Plugin\PriceCurrency;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
-class PriceCurrencyTest extends \PHPUnit_Framework_TestCase
+class PriceCurrencyTest extends \PHPUnit\Framework\TestCase
 {
 
     private $closureMock;
diff --git a/Ui/DataProvider/Product/Modifier/Price.php b/Ui/DataProvider/Product/Modifier/Price.php
new file mode 100755
index 0000000..41f7621
--- /dev/null
+++ b/Ui/DataProvider/Product/Modifier/Price.php
@@ -0,0 +1,108 @@
+<?php
+
+/**
+ *
+ * @package package Lillik\PriceDecimal\Ui\DataProvider\Product\Modifier
+ *
+ * @author  Lilian Codreanu <lilian.codreanu@gmail.com>
+ */
+
+namespace Lillik\PriceDecimal\Ui\DataProvider\Product\Modifier;
+
+use Magento\Catalog\Model\Locator\LocatorInterface;
+use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
+use Magento\Framework\App\Request\DataPersistorInterface;
+use Magento\Framework\Pricing\PriceCurrencyInterface;
+use Lillik\PriceDecimal\Model\ConfigInterface;
+use Lillik\PriceDecimal\Model\PricePrecisionConfigTrait;
+
+class Price extends AbstractModifier
+{
+    use PricePrecisionConfigTrait;
+
+    /**
+     * @var LocatorInterface
+     */
+    private $locator;
+    /**
+     * @var DataPersistorInterface
+     */
+    private $dataPersistor;
+    /**
+     * @var ConfigInterface
+     */
+    private $moduleConfig;
+
+    /**
+     * Price constructor.
+     *
+     * @param LocatorInterface       $locator
+     * @param DataPersistorInterface $dataPersistor
+     * @param ConfigInterface        $moduleConfig
+     */
+    public function __construct(
+        LocatorInterface $locator,
+        DataPersistorInterface $dataPersistor,
+        ConfigInterface $moduleConfig
+    ) {
+
+        $this->locator = $locator;
+        $this->dataPersistor = $dataPersistor;
+        $this->moduleConfig = $moduleConfig;
+    }
+
+    public function modifyData( array $data )
+    {
+        if (!$this->locator->getProduct()->getId() && $this->dataPersistor->get('catalog_product')) {
+            return $this->resolvePersistentData($data);
+        }
+        $productId = $this->locator->getProduct()->getId();
+        $productPrice =  $this->locator->getProduct()->getPrice();
+        $data[$productId][self::DATA_SOURCE_DEFAULT]['price'] = $this->formatPrice($productPrice);
+        return $data;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function modifyMeta( array $meta )
+    {
+        return $meta;
+    }
+
+    /**
+     * Format price to have only two decimals after delimiter
+     *
+     * @param mixed $value
+     * @return string
+     * @since 101.0.0
+     */
+    protected function formatPrice($value)
+    {
+        return $value !== null ? number_format((float)$value, $this->getPricePrecision(), '.', '') : '';
+    }
+
+    /**
+     * Resolve data persistence
+     *
+     * @param array $data
+     * @return array
+     */
+    private function resolvePersistentData(array $data)
+    {
+        $persistentData = (array)$this->dataPersistor->get('catalog_product');
+        $this->dataPersistor->clear('catalog_product');
+        $productId = $this->locator->getProduct()->getId();
+
+        if (empty($data[$productId][self::DATA_SOURCE_DEFAULT])) {
+            $data[$productId][self::DATA_SOURCE_DEFAULT] = [];
+        }
+
+        $data[$productId] = array_replace_recursive(
+            $data[$productId][self::DATA_SOURCE_DEFAULT],
+            $persistentData
+        );
+
+        return $data;
+    }
+}
\ No newline at end of file
diff --git a/composer.json b/composer.json
old mode 100644
new mode 100755
index dbf11df..2207d10
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
     ],
     "license": "Apache-2.0",
     "type": "magento2-module",
-    "version": "1.0.0",
+    "version": "1.0.6",
     "authors": [
         {
             "name": "Lilian Codreanu",
@@ -18,7 +18,7 @@
         "source": ""
     },
     "require": {
-        "php": "~5.6.0|7.0.2|7.0.4|~7.0.6",
+        "php": "~5.6.0|7.0.2|7.0.4|~7.0.6|~7.1",
         "magento/framework": "*"
     },
     "autoload": {
diff --git a/etc/acl.xml b/etc/acl.xml
old mode 100644
new mode 100755
diff --git a/etc/adminhtml/di.xml b/etc/adminhtml/di.xml
new file mode 100755
index 0000000..0bd17ed
--- /dev/null
+++ b/etc/adminhtml/di.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <virtualType name="Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Pool" type="Magento\Ui\DataProvider\Modifier\Pool">
+        <arguments>
+            <argument name="modifiers" xsi:type="array">
+                <item name="pricetab" xsi:type="array">
+                    <item name="class" xsi:type="string">Lillik\PriceDecimal\Ui\DataProvider\Product\Modifier\Price</item>
+                    <item name="sortOrder" xsi:type="number">200</item>
+                </item>
+                <item name="pricetabcart" xsi:type="array">
+                    <item name="class" xsi:type="string">Lillik\PriceDecimal\Ui\DataProvider\Product\Modifier\Price</item>
+                    <item name="sortOrder" xsi:type="number">200</item>
+                </item>
+                <item name="pricetabcheckout" xsi:type="array">
+                    <item name="class" xsi:type="string">Lillik\PriceDecimal\Ui\DataProvider\Product\Modifier\Price</item>
+                    <item name="sortOrder" xsi:type="number">200</item>
+                </item>
+            </argument>
+        </arguments>
+    </virtualType>
+</config>
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
old mode 100644
new mode 100755
index b654701..c047a49
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -1,30 +1,51 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
     <system>
-        <section id="catalog_price_decimal" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
+        <section id="catalog_price_decimal" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="0">
             <tab>catalog</tab>
             <resource>Lillik_PriceDecimal::config</resource>
             <label>Simple Price Decimal (Precision)</label>
-            <group id="general" translate="label" type="text" sortOrder="400" showInDefault="1" showInWebsite="0" showInStore="0">
+            <group id="general" translate="label" type="text" sortOrder="400" showInDefault="1" showInWebsite="1" showInStore="0">
                 <label>General</label>
-                <field id="enable" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="enable" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>Enable</label>
                     <source_model>Magento\Config\Model\Config\Source\Enabledisable</source_model>
                 </field>
-                <field id="can_show_decimal" translate="label" type="select" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="can_show_decimal" translate="label" type="select" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="0">
                     <depends>
                         <field id="*/*/enable">1</field>
                     </depends>
-                    <label>Show the decimal?</label>
+                    <label>Show decimal ?</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
-                <field id="price_precision" translate="label" type="text" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Decimal Length</label>
+                <field id="price_precision" translate="label" type="select" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="0">
+                    <label>Decimal length -- general purpose</label>
                     <depends>
                         <field id="*/*/enable">1</field>
-                    </depends>          
+                    </depends>
+                    <source_model>Lillik\PriceDecimal\Block\System\Config\Form\Field\Precision</source_model>
+                </field>
+                <field id="price_precisionCart" translate="label" type="select" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="0">
+                    <label>Decimal lenght -- Cart</label>
+                    <depends>
+                        <field id="*/*/enable">1</field>
+                    </depends>
+                    <source_model>Lillik\PriceDecimal\Block\System\Config\Form\Field\Precision</source_model>
+                </field>
+                <field id="price_precisionCheckout" translate="label" type="select" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="0">
+                    <label>Decimal lenght -- Checkout</label>
+                    <depends>
+                        <field id="*/*/enable">1</field>
+                    </depends>
+                    <source_model>Lillik\PriceDecimal\Block\System\Config\Form\Field\Precision</source_model>
+                </field>
+              <field id="disable_for_actions" translate="label" type="text" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="0">
+                    <label>Disable for actions</label>
+                    <depends>
+                        <field id="*/*/enable">1</field>
+                    </depends>
                 </field>
-        </group>
+				</group>
         </section>
     </system>
 </config>
diff --git a/etc/config.xml b/etc/config.xml
old mode 100644
new mode 100755
index a26da56..74bc8f3
--- a/etc/config.xml
+++ b/etc/config.xml
@@ -6,5 +6,35 @@
                 <price_precision>2</price_precision>
             </general>
         </catalog_price_decimal>
+        <catalog_price_decimalCart>
+            <general>
+               <price_precisionCart>2</price_precisionCart>
+					<disable_for_actions>checkout_klarna_index</disable_for_actions>
+            </general>
+        </catalog_price_decimalCart>
+        <catalog_price_decimalCheckout>
+            <general>
+                <price_precisionCheckout>2</price_precisionCheckout>
+            </general>
+        </catalog_price_decimalCheckout>
     </default>
+    <websites>
+        <admin>
+            <catalog_price_decimal>
+                <general>
+                    <enable>0</enable>
+                </general>
+            </catalog_price_decimal>
+	        <catalog_price_decimalCart>
+                <general>
+                    <enable>0</enable>
+                </general>
+	        </catalog_price_decimalCart>
+	        <catalog_price_decimalCheckout>
+                <general>
+                    <enable>0</enable>
+                </general>
+	        </catalog_price_decimalCheckout>
+        </admin>
+    </websites>
 </config>
diff --git a/etc/di.xml b/etc/di.xml
old mode 100644
new mode 100755
index 2198b1a..bd8766f
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -2,19 +2,20 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
 
     <preference for="Lillik\PriceDecimal\Model\ConfigInterface" type="Lillik\PriceDecimal\Model\Config" />
+    <preference for="Magento\Framework\CurrencyInterface" type="Lillik\PriceDecimal\Model\Currency" />
 
     <type name="Magento\Framework\Pricing\PriceCurrencyInterface">
-        <plugin name="lillik_price_decimal_price_currency"
-                type="Lillik\PriceDecimal\Model\Plugin\PriceCurrency"
-                sortOrder="10"
-                disabled="false"/>
+        <plugin name="lillik_price_decimal_price_currency" type="Lillik\PriceDecimal\Model\Plugin\PriceCurrency" sortOrder="10" disabled="false"/>
     </type>
-
     <type name="Magento\Framework\Locale\FormatInterface">
-        <plugin name="lillik_price_decimal_local_format"
-                type="Lillik\PriceDecimal\Model\Plugin\Local\Format"
-                sortOrder="10"
-                disabled="false"/>
+        <plugin name="lillik_price_decimal_local_format" type="Lillik\PriceDecimal\Model\Plugin\Local\Format" sortOrder="10" disabled="false"/>
+    </type>
+    <type name="Magento\Sales\Api\Data\OrderInterface">
+        <plugin name="lillik_price_decimal_for_orders" type="Lillik\PriceDecimal\Model\Plugin\OrderPlugin" sortOrder="10" disabled="false"/>
+    </type>
+
+    <type name="Magento\Framework\CurrencyInterface">
+        <plugin name="lillik_price_decimal_for_currency" type="Lillik\PriceDecimal\Model\Plugin\Currency" sortOrder="10" disabled="false"/>
     </type>
 
 </config>
diff --git a/etc/module.xml b/etc/module.xml
old mode 100644
new mode 100755
index 45e96f0..2792a8d
--- a/etc/module.xml
+++ b/etc/module.xml
@@ -1,5 +1,5 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Lillik_PriceDecimal" setup_version="1.0.0">
+    <module name="Lillik_PriceDecimal" setup_version="1.0.6">
         <sequence>
         </sequence>
     </module>
diff --git a/registration.php b/registration.php
old mode 100644
new mode 100755
diff --git a/view/frontend/requirejs-config.js b/view/frontend/requirejs-config.js
new file mode 100755
index 0000000..9f55fc9
--- /dev/null
+++ b/view/frontend/requirejs-config.js
@@ -0,0 +1,7 @@
+var config = {
+    map: {
+        '*': {
+            'Magento_Catalog/js/price-utils' : 'Lillik_PriceDecimal/js/price-utils'
+        }
+    }
+};
\ No newline at end of file
diff --git a/view/frontend/web/js/price-utils.js b/view/frontend/web/js/price-utils.js
new file mode 100755
index 0000000..7f32849
--- /dev/null
+++ b/view/frontend/web/js/price-utils.js
@@ -0,0 +1,127 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * @api
+ */
+define([
+    'jquery',
+    'underscore'
+], function ($, _) {
+    'use strict';
+
+    var globalPriceFormat = {
+        requiredPrecision: 2,
+        integerRequired: 1,
+        decimalSymbol: ',',
+        groupSymbol: ',',
+        groupLength: ','
+    };
+
+    /**
+     * Repeats {string} {times} times
+     * @param  {String} string
+     * @param  {Number} times
+     * @return {String}
+     */
+    function stringPad(string, times) {
+        return (new Array(times + 1)).join(string);
+    }
+
+    /**
+     * Formatter for price amount
+     * @param  {Number}  amount
+     * @param  {Object}  format
+     * @param  {Boolean} isShowSign
+     * @return {String}              Formatted value
+     */
+    function formatPrice(amount, format, isShowSign) {
+        var s = '',
+            precision, integerRequired, decimalSymbol, groupSymbol, groupLength, pattern, i, pad, j, re, r, am;
+
+        format = _.extend(globalPriceFormat, format);
+
+        // copied from price-option.js | Could be refactored with varien/js.js
+
+        precision = isNaN(format.requiredPrecision = Math.abs(format.requiredPrecision)) ? 2 : format.requiredPrecision;
+        integerRequired = isNaN(format.integerRequired = Math.abs(format.integerRequired)) ? 1 : format.integerRequired;
+        decimalSymbol = format.decimalSymbol === undefined ? ',' : format.decimalSymbol;
+        groupSymbol = format.groupSymbol === undefined ? '.' : format.groupSymbol;
+        groupLength = format.groupLength === undefined ? 3 : format.groupLength;
+        pattern = format.pattern || '%s';
+
+        if (isShowSign === undefined || isShowSign === true) {
+            s = amount < 0 ? '-' : isShowSign ? '+' : '';
+        } else if (isShowSign === false) {
+            s = '';
+        }
+        pattern = pattern.indexOf('{sign}') < 0 ? s + pattern : pattern.replace('{sign}', s);
+
+        // we're avoiding the usage of to fixed, and using round instead with the e representation to address
+        // numbers like 1.005 = 1.01. Using ToFixed to only provide trailig zeroes in case we have a whole number
+        i = parseInt(
+            amount = Number(Math.round(Math.abs(+amount || 0) + 'e+' + precision) + ('e-' + precision)),
+            10
+        ) + '';
+        pad = i.length < integerRequired ? integerRequired - i.length : 0;
+
+        i = stringPad('0', pad) + i;
+
+        j = i.length > groupLength ? i.length % groupLength : 0;
+        re = new RegExp('(\\d{' + groupLength + '})(?=\\d)', 'g');
+
+        // replace(/-/, 0) is only for fixing Safari bug which appears
+        // when Math.abs(0).toFixed() executed on '0' number.
+        // Result is '0.-0' :(
+
+        am = Number(Math.round(Math.abs(amount - i) + 'e+' + precision) + ('e-' + precision));
+        r = (j ? i.substr(0, j) + groupSymbol : '') +
+            i.substr(j).replace(re, '$1' + groupSymbol) +
+            (precision ? decimalSymbol + am.toFixed(precision).replace(/-/, 0).slice(2) : '');
+
+        return pattern.replace('%s', r).replace(/^\s\s*/, '').replace(/\s\s*$/, '');
+    }
+
+    /**
+     * Deep clone of Object. Doesn't support functions
+     * @param {Object} obj
+     * @return {Object}
+     */
+    function objectDeepClone(obj) {
+        return JSON.parse(JSON.stringify(obj));
+    }
+
+    /**
+     * Helper to find ID in name attribute
+     * @param   {jQuery} element
+     * @returns {undefined|String}
+     */
+    function findOptionId(element) {
+        var re, id, name;
+
+        if (!element) {
+            return id;
+        }
+        name = $(element).attr('name');
+
+        if (name.indexOf('[') !== -1) {
+            re = /\[([^\]]+)?\]/;
+        } else {
+            re = /_([^\]]+)?_/; // just to support file-type-option
+        }
+        id = re.exec(name) && re.exec(name)[1];
+
+        if (id) {
+            return id;
+        }
+    }
+
+    return {
+        formatPrice: formatPrice,
+        deepClone: objectDeepClone,
+        strPad: stringPad,
+        findOptionId: findOptionId
+    };
+});