diff --git a/playground/index.html b/playground/index.html
index 636b964..d3b40e6 100644
--- a/playground/index.html
+++ b/playground/index.html
@@ -8,9 +8,10 @@
 
     <link rel="stylesheet" href="main.css" />
 
-    <link rel="stylesheet" href="https://unpkg.com/leaflet@1.6.0/dist/leaflet.css" />
-    <script src="https://unpkg.com/leaflet@1.6.0/dist/leaflet.js"></script>
-    <script src="Leaflet.TrueSize.umd.js"></script>
+    <link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.3/dist/leaflet.css" />
+    <script src="https://unpkg.com/leaflet@1.9.3/dist/leaflet.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/@turf/turf@6/turf.min.js"></script>
+    <script src="l.js"></script>
     <style>
       html, body {
         margin: 0;
diff --git a/playground/l.js b/playground/l.js
new file mode 100644
index 0000000..b6b3f6c
--- /dev/null
+++ b/playground/l.js
@@ -0,0 +1,259 @@
+let id = 0;
+
+L.TrueSize = L.Layer.extend({
+  geoJSON: {
+    type: 'Feature',
+    properties: {},
+    geometry: {
+      type: 'Polygon',
+      coordinates: []
+    }
+  },
+
+  options: {
+    color: '#FF0000',
+    stroke: true,
+    weight: 1,
+    opacity: 1,
+    lineCap: 'round',
+    lineJoin: 'round',
+    dashArray: null,
+    dashOffset: null,
+    fill: true,
+    fillColor: '#FF0000',
+    fillOpacity: 0.3,
+    fillRule: 'evenodd',
+    className: null,
+    markerDiv: null,
+    markerClass: null,
+    iconAnchor: []
+  },
+
+  initialize(geoJSON = this.geoJSON, options = {}) {
+    // merge default and passed options
+    this._options = Object.assign({}, this.options, options);
+    this._geometryType = geoJSON.geometry.type;
+    this._isMultiPolygon = this._geometryType === 'MultiPolygon';
+
+    L.Util.setOptions(this, this._options);
+    this._initGeoJson(geoJSON, this._options);
+  },
+
+  _initGeoJson(geoJSON, options) {
+    this._geoJSONLayer = L.geoJSON(geoJSON, options);
+
+    // for unique plugin id
+    this._currentId = id++;
+  },
+
+  setCenter(center) {
+    this._redraw(center.slice(0).reverse());
+  },
+
+  reset() {
+    if (!this._origCenter) {
+      return false;
+    }
+
+    this._redraw(this._origCenter);
+  },
+
+  onAdd(map) {
+    this._map = map;
+    this._geoJSONLayer.addTo(this._map);
+
+    // our currentlayer is always the first layer of geoJson layersgroup
+    // but has a dynamic key
+    this._currentLayer = this._geoJSONLayer.getLayers()[0];
+    const centerCoords = this._currentLayer.getCenter();
+    this._origCenter = [centerCoords.lng, centerCoords.lat];
+
+    // wrap currentlayer into draggable layer
+    this._createDraggable(this._currentLayer);
+
+    this._initialBearingDistance = this._getBearingDistance([
+      centerCoords.lng,
+      centerCoords.lat
+    ]);
+
+    if (this._options.markerDiv && this._options.markerDiv.length) {
+      this._dragMarker = this._createMarker(centerCoords, this._options);
+      this._dragMarker.addTo(this._map);
+    }
+  },
+
+  _createMarker(center, options) {
+    const { markerClass, markerDiv, iconAnchor } = options;
+    const dragIcon = L.divIcon({
+      className: markerClass,
+      html: markerDiv,
+      iconAnchor
+    });
+
+    return L.marker(center, { icon: dragIcon, draggable: true })
+      .on('dragstart', this._onMarkerDragStart, this)
+      .on('drag', this._onMarkerDrag, this);
+  },
+
+  _onMarkerDragStart(evt) {
+    const { lng, lat } = evt.target._latlng;
+    const center = this._currentLayer.getCenter();
+
+    this._dragOffset = [lng - center.lng, lat - center.lat];
+  },
+
+  _onMarkerDrag(evt) {
+    this._redraw([evt.latlng.lng, evt.latlng.lat]);
+  },
+
+  _createDraggable(layer) {
+    const draggablePath = new L.Draggable(layer._path);
+    draggablePath.enable();
+
+    draggablePath
+      .on('dragstart', this._onDragStart, this)
+      .on('dragend', this._onDragEnd, this)
+      .on('predrag', this._onDrag, this);
+  },
+
+  _onDragStart(evt) {
+    const event = evt.touches ? evt.touches[0] : evt.target;
+    const pos = this._getPositionFromEvent(event);
+    const coords = this._getLatLngFromPosition(pos);
+    const center = this._currentLayer.getCenter();
+
+    this._dragOffset = [coords[0] - center.lng, coords[1] - center.lat];
+    this._currentLayer.setLatLngs([]);
+  },
+
+  _onDrag(evt) {
+    const event = evt.originalEvent.touches ? evt.originalEvent.touches[0] : evt.originalEvent;
+    const pos = this._getPositionFromEvent(event);
+    const coords = this._getLatLngFromPosition(pos);
+
+    this._redraw([
+      coords[0] - this._dragOffset[0],
+      coords[1] - this._dragOffset[1]
+    ]);
+  },
+
+  _onDragEnd(evt) {
+    this._geoJSONLayer.removeLayer(this._currentLayer);
+    this._currentLayer = this._geoJSONLayer.getLayers()[0];
+    this._createDraggable(this._currentLayer);
+  },
+
+  _getPositionFromEvent(evt) {
+    if (typeof evt._startPoint !== 'undefined') {
+      return evt._startPoint;
+    }
+
+    return { x: evt.clientX, y: evt.clientY };
+  },
+
+  _getLatLngFromPosition(pos) {
+    const { left, top } = this._map._container.getClientRects()[0];
+    const { x, y } = pos;
+
+    const posWithOffset = L.point(x - left, y - top);
+    const { lng, lat } = this._map.containerPointToLatLng(posWithOffset);
+    return [lng, lat];
+  },
+
+  _getBearingDistance(center) {
+    if (this._isMultiPolygon) {
+      return this._currentLayer.feature.geometry.coordinates[0].map(coords =>
+        coords.map(coord => this._getBearingAndDistance(center, coord))
+      );
+    }
+
+    return turf.coordAll(this._currentLayer.feature).map(coord =>
+      this._getBearingAndDistance(center, coord)
+    );
+  },
+
+  _getBearingAndDistance(center, coord) {
+    const bearing = turf.bearing(center, coord);
+    const distance = turf.distance(center, coord, { units: 'kilometers' });
+    return { bearing, distance };
+  },
+
+  _redraw(newPos) {
+    let newPoints;
+
+    if (this._isMultiPolygon) {
+      newPoints = this._initialBearingDistance.map(params => [
+        params.map(param => {
+          return turf.destination(newPos, param.distance, param.bearing, {
+            units: 'kilometers'
+          }).geometry.coordinates;
+        })
+      ]);
+    } else {
+      newPoints = this._initialBearingDistance.map(param => {
+        return turf.destination(newPos, param.distance, param.bearing, {
+          units: 'kilometers'
+        }).geometry.coordinates;
+      });
+    }
+
+    const newFeature = {
+      type: 'Feature',
+      properties: {},
+      geometry: {
+        type: this._geometryType,
+        coordinates: this._getCoordsByType(newPoints, this._geometryType)
+      }
+    };
+
+    // our currentlayer which accept dnd events is always the first layer of 
+    // geoJson layersgroup and shoud not be removed till drag end
+    this._redrawGeoJSON(newFeature);
+    this._dragMarker &&
+      this._redrawMarker();
+  },
+
+  _redrawGeoJSON(feature) {
+    const layers = this._geoJSONLayer.getLayers();
+    if (layers.length > 1) {
+      this._geoJSONLayer.removeLayer(layers[1]);
+    }
+    this._geoJSONLayer.addData(feature);
+  },
+
+  _redrawMarker() {
+    const layers = this._geoJSONLayer.getLayers();
+    if (layers.length > 1) {
+      this._dragMarker.setLatLng(layers[1].getCenter());
+    }
+  },
+
+  onRemove(map) {
+    this._map = map;
+    this._map.removeLayer(this._geoJSONLayer);
+    if (this._dragMarker) {
+      this._map.removeLayer(this._dragMarker);
+    }
+
+    return this;
+  },
+
+  _getCoordsByType(point, type) {
+    switch (type) {
+      case 'LineString': {
+        return point;
+      }
+      case 'Polygon': {
+        return [point];
+      }
+      case 'MultiPolygon': {
+        return point;
+      }
+      default: {
+        return [point];
+      }
+    }
+  }
+});
+
+L.trueSize = (geoJSON, options) => new L.TrueSize(geoJSON, options);
diff --git a/src/index.js b/src/index.js
index e3223ef..dc856cf 100644
--- a/src/index.js
+++ b/src/index.js
@@ -118,7 +118,8 @@ L.TrueSize = L.Layer.extend({
 
     draggablePath
       .on('dragstart', this._onDragStart, this)
-      .on('drag', this._onDrag, this);
+      .on('dragend', this._onDragEnd, this)
+      .on('predrag', this._onDrag, this);
   },
 
   _onDragStart(evt) {
@@ -128,10 +129,11 @@ L.TrueSize = L.Layer.extend({
     const center = this._currentLayer.getCenter();
 
     this._dragOffset = [coords[0] - center.lng, coords[1] - center.lat];
+    this._currentLayer.setLatLngs([]);
   },
 
   _onDrag(evt) {
-    const event = evt.touches ? evt.touches[0] : evt.originalEvent;
+    const event = evt.originalEvent.touches ? evt.originalEvent.touches[0] : evt.originalEvent;
     const pos = this._getPositionFromEvent(event);
     const coords = this._getLatLngFromPosition(pos);
 
@@ -141,6 +143,12 @@ L.TrueSize = L.Layer.extend({
     ]);
   },
 
+  _onDragEnd(evt) {
+    this._geoJSONLayer.removeLayer(this._currentLayer);
+    this._currentLayer = this._geoJSONLayer.getLayers()[0];
+    this._createDraggable(this._currentLayer);
+  },
+
   _getPositionFromEvent(evt) {
     if (typeof evt._startPoint !== 'undefined') {
       return evt._startPoint;
@@ -204,16 +212,26 @@ L.TrueSize = L.Layer.extend({
       }
     };
 
-    this._geoJSONLayer.clearLayers();
-    this._geoJSONLayer.addData(newFeature);
-    // our currentlayer is always the first layer of geoJson layersgroup
-    // but has a dynamic key
-    this._currentLayer = this._geoJSONLayer.getLayers()[0];
-    // add draggable hook again, as we using internal a new layer
-    // center marker if existing
-    this._createDraggable(this._currentLayer);
+    // our currentlayer which accept dnd events is always the first layer of 
+    // geoJson layersgroup and shoud not be removed till drag end
+    this._redrawGeoJSON(newFeature);
     this._dragMarker &&
-      this._dragMarker.setLatLng(this._currentLayer.getCenter());
+      this._redrawMarker();
+  },
+
+  _redrawGeoJSON(feature) {
+    const layers = this._geoJSONLayer.getLayers();
+    if (layers.length > 1) {
+      this._geoJSONLayer.removeLayer(layers[1]);
+    }
+    this._geoJSONLayer.addData(feature);
+  },
+
+  _redrawMarker() {
+    const layers = this._geoJSONLayer.getLayers();
+    if (layers.length > 1) {
+      this._dragMarker.setLatLng(layers[1].getCenter());
+    }
   },
 
   onRemove(map) {