diff --git a/babel-plugins.json b/babel-plugins.json
deleted file mode 100644
index d982204..0000000
--- a/babel-plugins.json
+++ /dev/null
@@ -1,13 +0,0 @@
-[
-  "check-es2015-constants",
-  "transform-es2015-arrow-functions",
-  "transform-es2015-block-scoped-functions",
-  "transform-es2015-block-scoping",
-  "transform-es2015-computed-properties",
-  "transform-es2015-destructuring",
-  "transform-es2015-duplicate-keys",
-  "transform-es2015-function-name",
-  "transform-es2015-literals",
-  "transform-es2015-shorthand-properties",
-  "transform-es2015-spread"
-]
\ No newline at end of file
diff --git a/cjs/package.json b/cjs/package.json
new file mode 100644
index 0000000..0292b99
--- /dev/null
+++ b/cjs/package.json
@@ -0,0 +1 @@
+{"type":"commonjs"}
\ No newline at end of file
diff --git a/cjs/utils.js b/cjs/utils.js
index 5785a55..efc98cc 100644
--- a/cjs/utils.js
+++ b/cjs/utils.js
@@ -1,7 +1,6 @@
 'use strict';
-const Map = (require('@ungap/essential-map'));
+const {indexOf: iOF} = require('uarray');
 
-const {indexOf: iOF} = [];
 const append = (get, parent, children, start, end, before) => {
   const isSelect = 'selectedIndex' in parent;
   let noSelection = isSelect;
@@ -122,13 +121,12 @@ const HS = (
   for (let i = 1; i < minLen; i++)
     tresh[i] = currentEnd;
 
-  const keymap = new Map;
-  for (let i = currentStart; i < currentEnd; i++)
-    keymap.set(currentNodes[i], i);
+  const nodes = currentNodes.slice(currentStart, currentEnd);
 
   for (let i = futureStart; i < futureEnd; i++) {
-    const idxInOld = keymap.get(futureNodes[i]);
-    if (idxInOld != null) {
+    const index = nodes.indexOf(futureNodes[i]);
+    if (-1 < index) {
+      const idxInOld = index + currentStart;
       k = findK(tresh, minLen, idxInOld);
       /* istanbul ignore else */
       if (-1 < k) {
@@ -269,7 +267,7 @@ const applyDiff = (
   currentLength,
   before
 ) => {
-  const live = new Map;
+  const live = [];
   const length = diff.length;
   let currentIndex = currentStart;
   let i = 0;
@@ -281,7 +279,7 @@ const applyDiff = (
         break;
       case INSERTION:
         // TODO: bulk appends for sequential nodes
-        live.set(futureNodes[futureStart], 1);
+        live.push(futureNodes[futureStart]);
         append(
           get,
           parentNode,
@@ -306,7 +304,7 @@ const applyDiff = (
         break;
       case DELETION:
         // TODO: bulk removes for sequential nodes
-        if (live.has(currentNodes[currentStart]))
+        if (-1 < live.indexOf(currentNodes[currentStart]))
           currentStart++;
         else
           remove(
diff --git a/esm/utils.js b/esm/utils.js
index 4f55904..b797065 100644
--- a/esm/utils.js
+++ b/esm/utils.js
@@ -1,6 +1,5 @@
-import Map from '@ungap/essential-map';
+import {indexOf as iOF} from 'uarray';
 
-const {indexOf: iOF} = [];
 export const append = (get, parent, children, start, end, before) => {
   const isSelect = 'selectedIndex' in parent;
   let noSelection = isSelect;
@@ -114,13 +113,12 @@ const HS = (
   for (let i = 1; i < minLen; i++)
     tresh[i] = currentEnd;
 
-  const keymap = new Map;
-  for (let i = currentStart; i < currentEnd; i++)
-    keymap.set(currentNodes[i], i);
+  const nodes = currentNodes.slice(currentStart, currentEnd);
 
   for (let i = futureStart; i < futureEnd; i++) {
-    const idxInOld = keymap.get(futureNodes[i]);
-    if (idxInOld != null) {
+    const index = nodes.indexOf(futureNodes[i]);
+    if (-1 < index) {
+      const idxInOld = index + currentStart;
       k = findK(tresh, minLen, idxInOld);
       /* istanbul ignore else */
       if (-1 < k) {
@@ -261,7 +259,7 @@ const applyDiff = (
   currentLength,
   before
 ) => {
-  const live = new Map;
+  const live = [];
   const length = diff.length;
   let currentIndex = currentStart;
   let i = 0;
@@ -273,7 +271,7 @@ const applyDiff = (
         break;
       case INSERTION:
         // TODO: bulk appends for sequential nodes
-        live.set(futureNodes[futureStart], 1);
+        live.push(futureNodes[futureStart]);
         append(
           get,
           parentNode,
@@ -298,7 +296,7 @@ const applyDiff = (
         break;
       case DELETION:
         // TODO: bulk removes for sequential nodes
-        if (live.has(currentNodes[currentStart]))
+        if (-1 < live.indexOf(currentNodes[currentStart]))
           currentStart++;
         else
           remove(
diff --git a/index.js b/index.js
index 59bef1c..b0b5331 100644
--- a/index.js
+++ b/index.js
@@ -1,417 +1,394 @@
 var domdiff = (function () {
-'use strict';
-
-/*! (c) Andrea Giammarchi - ISC */
-var self = null || /* istanbul ignore next */{};
-try {
-  self.Map = Map;
-} catch (Map) {
-  self.Map = function Map() {
-    var i = 0;
-    var k = [];
-    var v = [];
-    return {
-      delete: function _delete(key) {
-        var had = contains(key);
-        if (had) {
-          k.splice(i, 1);
-          v.splice(i, 1);
-        }
-        return had;
-      },
-      forEach: function forEach(callback, context) {
-        k.forEach(function (key, i) {
-          callback.call(context, v[i], key, this);
-        }, this);
-      },
-      get: function get(key) {
-        return contains(key) ? v[i] : void 0;
-      },
-      has: function has(key) {
-        return contains(key);
-      },
-      set: function set(key, value) {
-        v[contains(key) ? i : k.push(key) - 1] = value;
-        return this;
+  'use strict';
+
+  var _ref = [],
+      indexOf = _ref.indexOf;
+
+  var append = function append(get, parent, children, start, end, before) {
+    var isSelect = 'selectedIndex' in parent;
+    var noSelection = isSelect;
+
+    while (start < end) {
+      var child = get(children[start], 1);
+      parent.insertBefore(child, before);
+
+      if (isSelect && noSelection && child.selected) {
+        noSelection = !noSelection;
+        var selectedIndex = parent.selectedIndex;
+        parent.selectedIndex = selectedIndex < 0 ? start : indexOf.call(parent.querySelectorAll('option'), child);
+      }
+
+      start++;
+    }
+  };
+  var eqeq = function eqeq(a, b) {
+    return a == b;
+  };
+  var identity = function identity(O) {
+    return O;
+  };
+  var indexOf$1 = function indexOf(moreNodes, moreStart, moreEnd, lessNodes, lessStart, lessEnd, compare) {
+    var length = lessEnd - lessStart;
+    /* istanbul ignore if */
+
+    if (length < 1) return -1;
+
+    while (moreEnd - moreStart >= length) {
+      var m = moreStart;
+      var l = lessStart;
+
+      while (m < moreEnd && l < lessEnd && compare(moreNodes[m], lessNodes[l])) {
+        m++;
+        l++;
       }
-    };
-    function contains(v) {
-      i = k.indexOf(v);
-      return -1 < i;
+
+      if (l === lessEnd) return moreStart;
+      moreStart = m + 1;
     }
+
+    return -1;
   };
-}
-var Map$1 = self.Map;
-
-var iOF = [].indexOf;
-
-var append = function append(get, parent, children, start, end, before) {
-  var isSelect = 'selectedIndex' in parent;
-  var noSelection = isSelect;
-  while (start < end) {
-    var child = get(children[start], 1);
-    parent.insertBefore(child, before);
-    if (isSelect && noSelection && child.selected) {
-      noSelection = !noSelection;
-      var selectedIndex = parent.selectedIndex;
-
-      parent.selectedIndex = selectedIndex < 0 ? start : iOF.call(parent.querySelectorAll('option'), child);
+  var isReversed = function isReversed(futureNodes, futureEnd, currentNodes, currentStart, currentEnd, compare) {
+    while (currentStart < currentEnd && compare(currentNodes[currentStart], futureNodes[futureEnd - 1])) {
+      currentStart++;
+      futureEnd--;
     }
-    start++;
-  }
-};
-
-var eqeq = function eqeq(a, b) {
-  return a == b;
-};
-
-var identity = function identity(O) {
-  return O;
-};
-
-var indexOf = function indexOf(moreNodes, moreStart, moreEnd, lessNodes, lessStart, lessEnd, compare) {
-  var length = lessEnd - lessStart;
-  /* istanbul ignore if */
-  if (length < 1) return -1;
-  while (moreEnd - moreStart >= length) {
-    var m = moreStart;
-    var l = lessStart;
-    while (m < moreEnd && l < lessEnd && compare(moreNodes[m], lessNodes[l])) {
-      m++;
-      l++;
+    return futureEnd === 0;
+  };
+  var next = function next(get, list, i, length, before) {
+    return i < length ? get(list[i], 0) : 0 < i ? get(list[i - 1], -0).nextSibling : before;
+  };
+  var remove = function remove(get, children, start, end) {
+    while (start < end) {
+      drop(get(children[start++], -1));
     }
-    if (l === lessEnd) return moreStart;
-    moreStart = m + 1;
-  }
-  return -1;
-};
+  }; // - - - - - - - - - - - - - - - - - - -
+  // diff related constants and utilities
+  // - - - - - - - - - - - - - - - - - - -
 
-var isReversed = function isReversed(futureNodes, futureEnd, currentNodes, currentStart, currentEnd, compare) {
-  while (currentStart < currentEnd && compare(currentNodes[currentStart], futureNodes[futureEnd - 1])) {
-    currentStart++;
-    futureEnd--;
-  }
-  return futureEnd === 0;
-};
+  var DELETION = -1;
+  var INSERTION = 1;
+  var SKIP = 0;
+  var SKIP_OND = 50;
 
-var next = function next(get, list, i, length, before) {
-  return i < length ? get(list[i], 0) : 0 < i ? get(list[i - 1], -0).nextSibling : before;
-};
+  var HS = function HS(futureNodes, futureStart, futureEnd, futureChanges, currentNodes, currentStart, currentEnd, currentChanges) {
+    var k = 0;
+    /* istanbul ignore next */
 
-var remove = function remove(get, children, start, end) {
-  while (start < end) {
-    drop(get(children[start++], -1));
-  }
-};
-
-// - - - - - - - - - - - - - - - - - - -
-// diff related constants and utilities
-// - - - - - - - - - - - - - - - - - - -
-
-var DELETION = -1;
-var INSERTION = 1;
-var SKIP = 0;
-var SKIP_OND = 50;
-
-var HS = function HS(futureNodes, futureStart, futureEnd, futureChanges, currentNodes, currentStart, currentEnd, currentChanges) {
-
-  var k = 0;
-  /* istanbul ignore next */
-  var minLen = futureChanges < currentChanges ? futureChanges : currentChanges;
-  var link = Array(minLen++);
-  var tresh = Array(minLen);
-  tresh[0] = -1;
-
-  for (var i = 1; i < minLen; i++) {
-    tresh[i] = currentEnd;
-  }var keymap = new Map$1();
-  for (var _i = currentStart; _i < currentEnd; _i++) {
-    keymap.set(currentNodes[_i], _i);
-  }for (var _i2 = futureStart; _i2 < futureEnd; _i2++) {
-    var idxInOld = keymap.get(futureNodes[_i2]);
-    if (idxInOld != null) {
-      k = findK(tresh, minLen, idxInOld);
-      /* istanbul ignore else */
-      if (-1 < k) {
-        tresh[k] = idxInOld;
-        link[k] = {
-          newi: _i2,
-          oldi: idxInOld,
-          prev: link[k - 1]
-        };
+    var minLen = futureChanges < currentChanges ? futureChanges : currentChanges;
+    var link = Array(minLen++);
+    var tresh = Array(minLen);
+    tresh[0] = -1;
+
+    for (var i = 1; i < minLen; i++) {
+      tresh[i] = currentEnd;
+    }
+
+    var nodes = currentNodes.slice(currentStart, currentEnd);
+
+    for (var _i = futureStart; _i < futureEnd; _i++) {
+      var index = nodes.indexOf(futureNodes[_i]);
+
+      if (-1 < index) {
+        var idxInOld = index + currentStart;
+        k = findK(tresh, minLen, idxInOld);
+        /* istanbul ignore else */
+
+        if (-1 < k) {
+          tresh[k] = idxInOld;
+          link[k] = {
+            newi: _i,
+            oldi: idxInOld,
+            prev: link[k - 1]
+          };
+        }
       }
     }
-  }
 
-  k = --minLen;
-  --currentEnd;
-  while (tresh[k] > currentEnd) {
-    --k;
-  }minLen = currentChanges + futureChanges - k;
-  var diff = Array(minLen);
-  var ptr = link[k];
-  --futureEnd;
-  while (ptr) {
-    var _ptr = ptr,
-        newi = _ptr.newi,
-        oldi = _ptr.oldi;
-
-    while (futureEnd > newi) {
+    k = --minLen;
+    --currentEnd;
+
+    while (tresh[k] > currentEnd) {
+      --k;
+    }
+
+    minLen = currentChanges + futureChanges - k;
+    var diff = Array(minLen);
+    var ptr = link[k];
+    --futureEnd;
+
+    while (ptr) {
+      var _ptr = ptr,
+          newi = _ptr.newi,
+          oldi = _ptr.oldi;
+
+      while (futureEnd > newi) {
+        diff[--minLen] = INSERTION;
+        --futureEnd;
+      }
+
+      while (currentEnd > oldi) {
+        diff[--minLen] = DELETION;
+        --currentEnd;
+      }
+
+      diff[--minLen] = SKIP;
+      --futureEnd;
+      --currentEnd;
+      ptr = ptr.prev;
+    }
+
+    while (futureEnd >= futureStart) {
       diff[--minLen] = INSERTION;
       --futureEnd;
     }
-    while (currentEnd > oldi) {
+
+    while (currentEnd >= currentStart) {
       diff[--minLen] = DELETION;
       --currentEnd;
     }
-    diff[--minLen] = SKIP;
-    --futureEnd;
-    --currentEnd;
-    ptr = ptr.prev;
-  }
-  while (futureEnd >= futureStart) {
-    diff[--minLen] = INSERTION;
-    --futureEnd;
-  }
-  while (currentEnd >= currentStart) {
-    diff[--minLen] = DELETION;
-    --currentEnd;
-  }
-  return diff;
-};
-
-// this is pretty much the same petit-dom code without the delete map part
-// https://github.com/yelouafi/petit-dom/blob/bd6f5c919b5ae5297be01612c524c40be45f14a7/src/vdom.js#L556-L561
-var OND = function OND(futureNodes, futureStart, rows, currentNodes, currentStart, cols, compare) {
-  var length = rows + cols;
-  var v = [];
-  var d = void 0,
-      k = void 0,
-      r = void 0,
-      c = void 0,
-      pv = void 0,
-      cv = void 0,
-      pd = void 0;
-  outer: for (d = 0; d <= length; d++) {
-    /* istanbul ignore if */
-    if (d > SKIP_OND) return null;
-    pd = d - 1;
-    /* istanbul ignore next */
-    pv = d ? v[d - 1] : [0, 0];
-    cv = v[d] = [];
-    for (k = -d; k <= d; k += 2) {
-      if (k === -d || k !== d && pv[pd + k - 1] < pv[pd + k + 1]) {
-        c = pv[pd + k + 1];
-      } else {
-        c = pv[pd + k - 1] + 1;
+
+    return diff;
+  }; // this is pretty much the same petit-dom code without the delete map part
+  // https://github.com/yelouafi/petit-dom/blob/bd6f5c919b5ae5297be01612c524c40be45f14a7/src/vdom.js#L556-L561
+
+
+  var OND = function OND(futureNodes, futureStart, rows, currentNodes, currentStart, cols, compare) {
+    var length = rows + cols;
+    var v = [];
+    var d, k, r, c, pv, cv, pd;
+
+    outer: for (d = 0; d <= length; d++) {
+      /* istanbul ignore if */
+      if (d > SKIP_OND) return null;
+      pd = d - 1;
+      /* istanbul ignore next */
+
+      pv = d ? v[d - 1] : [0, 0];
+      cv = v[d] = [];
+
+      for (k = -d; k <= d; k += 2) {
+        if (k === -d || k !== d && pv[pd + k - 1] < pv[pd + k + 1]) {
+          c = pv[pd + k + 1];
+        } else {
+          c = pv[pd + k - 1] + 1;
+        }
+
+        r = c - k;
+
+        while (c < cols && r < rows && compare(currentNodes[currentStart + c], futureNodes[futureStart + r])) {
+          c++;
+          r++;
+        }
+
+        if (c === cols && r === rows) {
+          break outer;
+        }
+
+        cv[d + k] = c;
       }
-      r = c - k;
-      while (c < cols && r < rows && compare(currentNodes[currentStart + c], futureNodes[futureStart + r])) {
-        c++;
-        r++;
+    }
+
+    var diff = Array(d / 2 + length / 2);
+    var diffIdx = diff.length - 1;
+
+    for (d = v.length - 1; d >= 0; d--) {
+      while (c > 0 && r > 0 && compare(currentNodes[currentStart + c - 1], futureNodes[futureStart + r - 1])) {
+        // diagonal edge = equality
+        diff[diffIdx--] = SKIP;
+        c--;
+        r--;
       }
-      if (c === cols && r === rows) {
-        break outer;
+
+      if (!d) break;
+      pd = d - 1;
+      /* istanbul ignore next */
+
+      pv = d ? v[d - 1] : [0, 0];
+      k = c - r;
+
+      if (k === -d || k !== d && pv[pd + k - 1] < pv[pd + k + 1]) {
+        // vertical edge = insertion
+        r--;
+        diff[diffIdx--] = INSERTION;
+      } else {
+        // horizontal edge = deletion
+        c--;
+        diff[diffIdx--] = DELETION;
       }
-      cv[d + k] = c;
     }
-  }
 
-  var diff = Array(d / 2 + length / 2);
-  var diffIdx = diff.length - 1;
-  for (d = v.length - 1; d >= 0; d--) {
-    while (c > 0 && r > 0 && compare(currentNodes[currentStart + c - 1], futureNodes[futureStart + r - 1])) {
-      // diagonal edge = equality
-      diff[diffIdx--] = SKIP;
-      c--;
-      r--;
-    }
-    if (!d) break;
-    pd = d - 1;
-    /* istanbul ignore next */
-    pv = d ? v[d - 1] : [0, 0];
-    k = c - r;
-    if (k === -d || k !== d && pv[pd + k - 1] < pv[pd + k + 1]) {
-      // vertical edge = insertion
-      r--;
-      diff[diffIdx--] = INSERTION;
-    } else {
-      // horizontal edge = deletion
-      c--;
-      diff[diffIdx--] = DELETION;
+    return diff;
+  };
+
+  var applyDiff = function applyDiff(diff, get, parentNode, futureNodes, futureStart, currentNodes, currentStart, currentLength, before) {
+    var live = [];
+    var length = diff.length;
+    var currentIndex = currentStart;
+    var i = 0;
+
+    while (i < length) {
+      switch (diff[i++]) {
+        case SKIP:
+          futureStart++;
+          currentIndex++;
+          break;
+
+        case INSERTION:
+          // TODO: bulk appends for sequential nodes
+          live.push(futureNodes[futureStart]);
+          append(get, parentNode, futureNodes, futureStart++, futureStart, currentIndex < currentLength ? get(currentNodes[currentIndex], 0) : before);
+          break;
+
+        case DELETION:
+          currentIndex++;
+          break;
+      }
     }
-  }
-  return diff;
-};
-
-var applyDiff = function applyDiff(diff, get, parentNode, futureNodes, futureStart, currentNodes, currentStart, currentLength, before) {
-  var live = new Map$1();
-  var length = diff.length;
-  var currentIndex = currentStart;
-  var i = 0;
-  while (i < length) {
-    switch (diff[i++]) {
-      case SKIP:
-        futureStart++;
-        currentIndex++;
-        break;
-      case INSERTION:
-        // TODO: bulk appends for sequential nodes
-        live.set(futureNodes[futureStart], 1);
-        append(get, parentNode, futureNodes, futureStart++, futureStart, currentIndex < currentLength ? get(currentNodes[currentIndex], 0) : before);
-        break;
-      case DELETION:
-        currentIndex++;
-        break;
+
+    i = 0;
+
+    while (i < length) {
+      switch (diff[i++]) {
+        case SKIP:
+          currentStart++;
+          break;
+
+        case DELETION:
+          // TODO: bulk removes for sequential nodes
+          if (-1 < live.indexOf(currentNodes[currentStart])) currentStart++;else remove(get, currentNodes, currentStart++, currentStart);
+          break;
+      }
     }
-  }
-  i = 0;
-  while (i < length) {
-    switch (diff[i++]) {
-      case SKIP:
-        currentStart++;
-        break;
-      case DELETION:
-        // TODO: bulk removes for sequential nodes
-        if (live.has(currentNodes[currentStart])) currentStart++;else remove(get, currentNodes, currentStart++, currentStart);
-        break;
+  };
+
+  var findK = function findK(ktr, length, j) {
+    var lo = 1;
+    var hi = length;
+
+    while (lo < hi) {
+      var mid = (lo + hi) / 2 >>> 0;
+      if (j < ktr[mid]) hi = mid;else lo = mid + 1;
     }
-  }
-};
-
-var findK = function findK(ktr, length, j) {
-  var lo = 1;
-  var hi = length;
-  while (lo < hi) {
-    var mid = (lo + hi) / 2 >>> 0;
-    if (j < ktr[mid]) hi = mid;else lo = mid + 1;
-  }
-  return lo;
-};
-
-var smartDiff = function smartDiff(get, parentNode, futureNodes, futureStart, futureEnd, futureChanges, currentNodes, currentStart, currentEnd, currentChanges, currentLength, compare, before) {
-  applyDiff(OND(futureNodes, futureStart, futureChanges, currentNodes, currentStart, currentChanges, compare) || HS(futureNodes, futureStart, futureEnd, futureChanges, currentNodes, currentStart, currentEnd, currentChanges), get, parentNode, futureNodes, futureStart, currentNodes, currentStart, currentLength, before);
-};
-
-var drop = function drop(node) {
-  return (node.remove || dropChild).call(node);
-};
-
-function dropChild() {
-  var parentNode = this.parentNode;
-  /* istanbul ignore else */
-
-  if (parentNode) parentNode.removeChild(this);
-}
-
-/*! (c) 2018 Andrea Giammarchi (ISC) */
-
-var domdiff = function domdiff(parentNode, // where changes happen
-currentNodes, // Array of current items/nodes
-futureNodes, // Array of future items/nodes
-options // optional object with one of the following properties
-//  before: domNode
-//  compare(generic, generic) => true if same generic
-//  node(generic) => Node
-) {
-  if (!options) options = {};
-
-  var compare = options.compare || eqeq;
-  var get = options.node || identity;
-  var before = options.before == null ? null : get(options.before, 0);
-
-  var currentLength = currentNodes.length;
-  var currentEnd = currentLength;
-  var currentStart = 0;
-
-  var futureEnd = futureNodes.length;
-  var futureStart = 0;
-
-  // common prefix
-  while (currentStart < currentEnd && futureStart < futureEnd && compare(currentNodes[currentStart], futureNodes[futureStart])) {
-    currentStart++;
-    futureStart++;
-  }
 
-  // common suffix
-  while (currentStart < currentEnd && futureStart < futureEnd && compare(currentNodes[currentEnd - 1], futureNodes[futureEnd - 1])) {
-    currentEnd--;
-    futureEnd--;
-  }
+    return lo;
+  };
+
+  var smartDiff = function smartDiff(get, parentNode, futureNodes, futureStart, futureEnd, futureChanges, currentNodes, currentStart, currentEnd, currentChanges, currentLength, compare, before) {
+    applyDiff(OND(futureNodes, futureStart, futureChanges, currentNodes, currentStart, currentChanges, compare) || HS(futureNodes, futureStart, futureEnd, futureChanges, currentNodes, currentStart, currentEnd, currentChanges), get, parentNode, futureNodes, futureStart, currentNodes, currentStart, currentLength, before);
+  };
 
-  var currentSame = currentStart === currentEnd;
-  var futureSame = futureStart === futureEnd;
+  var drop = function drop(node) {
+    return (node.remove || dropChild).call(node);
+  };
 
-  // same list
-  if (currentSame && futureSame) return futureNodes;
+  function dropChild() {
+    var parentNode = this.parentNode;
+    /* istanbul ignore else */
 
-  // only stuff to add
-  if (currentSame && futureStart < futureEnd) {
-    append(get, parentNode, futureNodes, futureStart, futureEnd, next(get, currentNodes, currentStart, currentLength, before));
-    return futureNodes;
+    if (parentNode) parentNode.removeChild(this);
   }
 
-  // only stuff to remove
-  if (futureSame && currentStart < currentEnd) {
-    remove(get, currentNodes, currentStart, currentEnd);
-    return futureNodes;
-  }
+  /*! (c) 2018 Andrea Giammarchi (ISC) */
+
+  var domdiff = function domdiff(parentNode, // where changes happen
+  currentNodes, // Array of current items/nodes
+  futureNodes, // Array of future items/nodes
+  options // optional object with one of the following properties
+  //  before: domNode
+  //  compare(generic, generic) => true if same generic
+  //  node(generic) => Node
+  ) {
+    if (!options) options = {};
+    var compare = options.compare || eqeq;
+    var get = options.node || identity;
+    var before = options.before == null ? null : get(options.before, 0);
+    var currentLength = currentNodes.length;
+    var currentEnd = currentLength;
+    var currentStart = 0;
+    var futureEnd = futureNodes.length;
+    var futureStart = 0; // common prefix
+
+    while (currentStart < currentEnd && futureStart < futureEnd && compare(currentNodes[currentStart], futureNodes[futureStart])) {
+      currentStart++;
+      futureStart++;
+    } // common suffix
+
+
+    while (currentStart < currentEnd && futureStart < futureEnd && compare(currentNodes[currentEnd - 1], futureNodes[futureEnd - 1])) {
+      currentEnd--;
+      futureEnd--;
+    }
+
+    var currentSame = currentStart === currentEnd;
+    var futureSame = futureStart === futureEnd; // same list
+
+    if (currentSame && futureSame) return futureNodes; // only stuff to add
+
+    if (currentSame && futureStart < futureEnd) {
+      append(get, parentNode, futureNodes, futureStart, futureEnd, next(get, currentNodes, currentStart, currentLength, before));
+      return futureNodes;
+    } // only stuff to remove
+
 
-  var currentChanges = currentEnd - currentStart;
-  var futureChanges = futureEnd - futureStart;
-  var i = -1;
-
-  // 2 simple indels: the shortest sequence is a subsequence of the longest
-  if (currentChanges < futureChanges) {
-    i = indexOf(futureNodes, futureStart, futureEnd, currentNodes, currentStart, currentEnd, compare);
-    // inner diff
-    if (-1 < i) {
-      append(get, parentNode, futureNodes, futureStart, i, get(currentNodes[currentStart], 0));
-      append(get, parentNode, futureNodes, i + currentChanges, futureEnd, next(get, currentNodes, currentEnd, currentLength, before));
+    if (futureSame && currentStart < currentEnd) {
+      remove(get, currentNodes, currentStart, currentEnd);
       return futureNodes;
     }
-  }
-  /* istanbul ignore else */
-  else if (futureChanges < currentChanges) {
-      i = indexOf(currentNodes, currentStart, currentEnd, futureNodes, futureStart, futureEnd, compare);
-      // outer diff
+
+    var currentChanges = currentEnd - currentStart;
+    var futureChanges = futureEnd - futureStart;
+    var i = -1; // 2 simple indels: the shortest sequence is a subsequence of the longest
+
+    if (currentChanges < futureChanges) {
+      i = indexOf$1(futureNodes, futureStart, futureEnd, currentNodes, currentStart, currentEnd, compare); // inner diff
+
       if (-1 < i) {
-        remove(get, currentNodes, currentStart, i);
-        remove(get, currentNodes, i + futureChanges, currentEnd);
+        append(get, parentNode, futureNodes, futureStart, i, get(currentNodes[currentStart], 0));
+        append(get, parentNode, futureNodes, i + currentChanges, futureEnd, next(get, currentNodes, currentEnd, currentLength, before));
         return futureNodes;
       }
     }
+    /* istanbul ignore else */
+    else if (futureChanges < currentChanges) {
+        i = indexOf$1(currentNodes, currentStart, currentEnd, futureNodes, futureStart, futureEnd, compare); // outer diff
+
+        if (-1 < i) {
+          remove(get, currentNodes, currentStart, i);
+          remove(get, currentNodes, i + futureChanges, currentEnd);
+          return futureNodes;
+        }
+      } // common case with one replacement for many nodes
+    // or many nodes replaced for a single one
 
-  // common case with one replacement for many nodes
-  // or many nodes replaced for a single one
-  /* istanbul ignore else */
-  if (currentChanges < 2 || futureChanges < 2) {
-    append(get, parentNode, futureNodes, futureStart, futureEnd, get(currentNodes[currentStart], 0));
-    remove(get, currentNodes, currentStart, currentEnd);
-    return futureNodes;
-  }
+    /* istanbul ignore else */
 
-  // the half match diff part has been skipped in petit-dom
-  // https://github.com/yelouafi/petit-dom/blob/bd6f5c919b5ae5297be01612c524c40be45f14a7/src/vdom.js#L391-L397
-  // accordingly, I think it's safe to skip in here too
-  // if one day it'll come out like the speediest thing ever to do
-  // then I might add it in here too
 
-  // Extra: before going too fancy, what about reversed lists ?
-  //        This should bail out pretty quickly if that's not the case.
-  if (currentChanges === futureChanges && isReversed(futureNodes, futureEnd, currentNodes, currentStart, currentEnd, compare)) {
-    append(get, parentNode, futureNodes, futureStart, futureEnd, next(get, currentNodes, currentEnd, currentLength, before));
-    return futureNodes;
-  }
+    if (currentChanges < 2 || futureChanges < 2) {
+      append(get, parentNode, futureNodes, futureStart, futureEnd, get(currentNodes[currentStart], 0));
+      remove(get, currentNodes, currentStart, currentEnd);
+      return futureNodes;
+    } // the half match diff part has been skipped in petit-dom
+    // https://github.com/yelouafi/petit-dom/blob/bd6f5c919b5ae5297be01612c524c40be45f14a7/src/vdom.js#L391-L397
+    // accordingly, I think it's safe to skip in here too
+    // if one day it'll come out like the speediest thing ever to do
+    // then I might add it in here too
+    // Extra: before going too fancy, what about reversed lists ?
+    //        This should bail out pretty quickly if that's not the case.
 
-  // last resort through a smart diff
-  smartDiff(get, parentNode, futureNodes, futureStart, futureEnd, futureChanges, currentNodes, currentStart, currentEnd, currentChanges, currentLength, compare, before);
 
-  return futureNodes;
-};
+    if (currentChanges === futureChanges && isReversed(futureNodes, futureEnd, currentNodes, currentStart, currentEnd, compare)) {
+      append(get, parentNode, futureNodes, futureStart, futureEnd, next(get, currentNodes, currentEnd, currentLength, before));
+      return futureNodes;
+    } // last resort through a smart diff
+
 
+    smartDiff(get, parentNode, futureNodes, futureStart, futureEnd, futureChanges, currentNodes, currentStart, currentEnd, currentChanges, currentLength, compare, before);
+    return futureNodes;
+  };
 
+  
 
-return domdiff;
+  return domdiff;
 
 }());
diff --git a/min.js b/min.js
index 759d0d0..cd28ee8 100644
--- a/min.js
+++ b/min.js
@@ -1,2 +1,2 @@
-var domdiff=function(){"use strict";function r(){var r=this.parentNode;r&&r.removeChild(this)}/*! (c) Andrea Giammarchi - ISC */
-var n={};try{n.Map=Map}catch(Map){n.Map=function(){function r(r){return-1<(n=e.indexOf(r))}var n=0,e=[],t=[];return{"delete":function(o){var f=r(o);return f&&(e.splice(n,1),t.splice(n,1)),f},forEach:function(r,n){e.forEach(function(e,o){r.call(n,t[o],e,this)},this)},get:function(e){return r(e)?t[n]:void 0},has:function(n){return r(n)},set:function(o,f){return t[r(o)?n:e.push(o)-1]=f,this}}}}var e=n.Map,t=[].indexOf,o=function(r,n,e,o,f,i){for(var u=("selectedIndex"in n),a=u;o<f;){var c=r(e[o],1);if(n.insertBefore(c,i),u&&a&&c.selected){a=!a;var v=n.selectedIndex;n.selectedIndex=v<0?o:t.call(n.querySelectorAll("option"),c)}o++}},f=function(r,n){return r==n},i=function(r){return r},u=function(r,n,e,t,o,f,i){var u=f-o;if(u<1)return-1;for(;e-n>=u;){for(var a=n,c=o;a<e&&c<f&&i(r[a],t[c]);)a++,c++;if(c===f)return n;n=a+1}return-1},a=function(r,n,e,t,o,f){for(;t<o&&f(e[t],r[n-1]);)t++,n--;return 0===n},c=function(r,n,e,t,o){return e<t?r(n[e],0):0<e?r(n[e-1],-0).nextSibling:o},v=function(r,n,e,t){for(;e<t;)b(r(n[e++],-1))},l=function(r,n,t,o,f,i,u,a){var c=0,v=o<a?o:a,l=Array(v++),s=Array(v);s[0]=-1;for(var d=1;d<v;d++)s[d]=u;for(var p=new e,b=i;b<u;b++)p.set(f[b],b);for(var g=n;g<t;g++){var w=p.get(r[g]);null!=w&&-1<(c=h(s,v,w))&&(s[c]=w,l[c]={newi:g,oldi:w,prev:l[c-1]})}for(c=--v,--u;s[c]>u;)--c;v=a+o-c;var x=Array(v),y=l[c];for(--t;y;){for(var k=y,A=k.newi,M=k.oldi;t>A;)x[--v]=1,--t;for(;u>M;)x[--v]=-1,--u;x[--v]=0,--t,--u,y=y.prev}for(;t>=n;)x[--v]=1,--t;for(;u>=i;)x[--v]=-1,--u;return x},s=function(r,n,e,t,o,f,i){var u=e+f,a=[],c=void 0,v=void 0,l=void 0,s=void 0,d=void 0,h=void 0,p=void 0;r:for(c=0;c<=u;c++){if(c>50)return null;for(p=c-1,d=c?a[c-1]:[0,0],h=a[c]=[],v=-c;v<=c;v+=2){for(s=v===-c||v!==c&&d[p+v-1]<d[p+v+1]?d[p+v+1]:d[p+v-1]+1,l=s-v;s<f&&l<e&&i(t[o+s],r[n+l]);)s++,l++;if(s===f&&l===e)break r;h[c+v]=s}}var b=Array(c/2+u/2),g=b.length-1;for(c=a.length-1;c>=0;c--){for(;s>0&&l>0&&i(t[o+s-1],r[n+l-1]);)b[g--]=0,s--,l--;if(!c)break;p=c-1,d=c?a[c-1]:[0,0],v=s-l,v===-c||v!==c&&d[p+v-1]<d[p+v+1]?(l--,b[g--]=1):(s--,b[g--]=-1)}return b},d=function(r,n,t,f,i,u,a,c,l){for(var s=new e,d=r.length,h=a,p=0;p<d;)switch(r[p++]){case 0:i++,h++;break;case 1:s.set(f[i],1),o(n,t,f,i++,i,h<c?n(u[h],0):l);break;case-1:h++}for(p=0;p<d;)switch(r[p++]){case 0:a++;break;case-1:s.has(u[a])?a++:v(n,u,a++,a)}},h=function(r,n,e){for(var t=1,o=n;t<o;){var f=(t+o)/2>>>0;e<r[f]?o=f:t=f+1}return t},p=function(r,n,e,t,o,f,i,u,a,c,v,h,p){d(s(e,t,f,i,u,c,h)||l(e,t,o,f,i,u,a,c),r,n,e,t,i,u,v,p)},b=function(n){return(n.remove||r).call(n)};return function(r,n,e,t){t||(t={});for(var l=t.compare||f,s=t.node||i,d=null==t.before?null:s(t.before,0),h=n.length,b=h,g=0,w=e.length,x=0;g<b&&x<w&&l(n[g],e[x]);)g++,x++;for(;g<b&&x<w&&l(n[b-1],e[w-1]);)b--,w--;var y=g===b,k=x===w;if(y&&k)return e;if(y&&x<w)return o(s,r,e,x,w,c(s,n,g,h,d)),e;if(k&&g<b)return v(s,n,g,b),e;var A=b-g,M=w-x,m=-1;if(A<M){if(-1<(m=u(e,x,w,n,g,b,l)))return o(s,r,e,x,m,s(n[g],0)),o(s,r,e,m+A,w,c(s,n,b,h,d)),e}else if(M<A&&-1<(m=u(n,g,b,e,x,w,l)))return v(s,n,g,m),v(s,n,m+M,b),e;return A<2||M<2?(o(s,r,e,x,w,s(n[g],0)),v(s,n,g,b),e):A===M&&a(e,w,n,g,b,l)?(o(s,r,e,x,w,c(s,n,b,h,d)),e):(p(s,r,e,x,w,M,n,g,b,A,h,l,d),e)}}();
\ No newline at end of file
+var domdiff=function(){"use strict";function g(r,e,n,f,t,o){for(var i=("selectedIndex"in e),a=i;f<t;){var u=r(n[f],1);if(e.insertBefore(u,o),i&&a&&u.selected){a=!a;var c=e.selectedIndex;e.selectedIndex=c<0?f:l.call(e.querySelectorAll("option"),u)}f++}}function p(r,e){return r==e}function k(r){return r}function y(r,e,n,f,t,o,i){var a=o-t;if(a<1)return-1;for(;a<=n-e;){for(var u=e,c=t;u<n&&c<o&&i(r[u],f[c]);)u++,c++;if(c===o)return e;e=u+1}return-1}function A(r,e,n,f,t){return n<f?r(e[n],0):0<n?r(e[n-1],-0).nextSibling:t}function m(r,e,n,f){for(;n<f;)t(r(e[n++],-1))}function w(r,e,n,f,t,o,i,a,u,c,l,v,s){!function(r,e,n,f,t,o,i,a,u){for(var c=[],l=r.length,v=i,s=0;s<l;)switch(r[s++]){case 0:t++,v++;break;case 1:c.push(f[t]),g(e,n,f,t++,t,v<a?e(o[v],0):u);break;case-1:v++}for(s=0;s<l;)switch(r[s++]){case 0:i++;break;case-1:-1<c.indexOf(o[i])?i++:m(e,o,i++,i)}}(function(r,e,n,f,t,o,i){var a,u,c,l,v,s,d,h=n+o,b=[];r:for(a=0;a<=h;a++){if(50<a)return null;for(d=a-1,v=a?b[a-1]:[0,0],s=b[a]=[],u=-a;u<=a;u+=2){for(c=(l=u===-a||u!==a&&v[d+u-1]<v[d+u+1]?v[d+u+1]:v[d+u-1]+1)-u;l<o&&c<n&&i(f[t+l],r[e+c]);)l++,c++;if(l===o&&c===n)break r;s[a+u]=l}}var x=Array(a/2+h/2),g=x.length-1;for(a=b.length-1;0<=a;a--){for(;0<l&&0<c&&i(f[t+l-1],r[e+c-1]);)x[g--]=0,l--,c--;if(!a)break;d=a-1,v=a?b[a-1]:[0,0],(u=l-c)===-a||u!==a&&v[d+u-1]<v[d+u+1]?(c--,x[g--]=1):(l--,x[g--]=-1)}return x}(n,f,o,i,a,c,v)||function(r,e,n,f,t,o,i,a){var u=0,c=f<a?f:a,l=Array(c++),v=Array(c);v[0]=-1;for(var s=1;s<c;s++)v[s]=i;for(var d=t.slice(o,i),h=e;h<n;h++){var b=d.indexOf(r[h]);if(-1<b){var x=b+o;-1<(u=I(v,c,x))&&(v[u]=x,l[u]={newi:h,oldi:x,prev:l[u-1]})}}for(u=--c,--i;v[u]>i;)--u;c=a+f-u;var g=Array(c),p=l[u];for(--n;p;){for(var k=p.newi,y=p.oldi;k<n;)g[--c]=1,--n;for(;y<i;)g[--c]=-1,--i;g[--c]=0,--n,--i,p=p.prev}for(;e<=n;)g[--c]=1,--n;for(;o<=i;)g[--c]=-1,--i;return g}(n,f,t,o,i,a,u,c),r,e,n,f,i,a,l,s)}var l=[].indexOf,I=function(r,e,n){for(var f=1,t=e;f<t;){var o=(f+t)/2>>>0;n<r[o]?t=o:f=1+o}return f},t=function(r){return(r.remove||function(){var r=this.parentNode;r&&r.removeChild(this)}
+/*! (c) 2018 Andrea Giammarchi (ISC) */).call(r)};return function(r,e,n,f){for(var t=(f=f||{}).compare||p,o=f.node||k,i=null==f.before?null:o(f.before,0),a=e.length,u=a,c=0,l=n.length,v=0;c<u&&v<l&&t(e[c],n[v]);)c++,v++;for(;c<u&&v<l&&t(e[u-1],n[l-1]);)u--,l--;var s=c===u,d=v===l;if(s&&d)return n;if(s&&v<l)return g(o,r,n,v,l,A(o,e,c,a,i)),n;if(d&&c<u)return m(o,e,c,u),n;var h=u-c,b=l-v,x=-1;if(h<b){if(-1<(x=y(n,v,l,e,c,u,t)))return g(o,r,n,v,x,o(e[c],0)),g(o,r,n,x+h,l,A(o,e,u,a,i)),n}else if(b<h&&-1<(x=y(e,c,u,n,v,l,t)))return m(o,e,c,x),m(o,e,x+b,u),n;return h<2||b<2?(g(o,r,n,v,l,o(e[c],0)),m(o,e,c,u)):h==b&&function(r,e,n,f,t,o){for(;f<t&&o(n[f],r[e-1]);)f++,e--;return 0===e}(n,l,e,c,u,t)?g(o,r,n,v,l,A(o,e,u,a,i)):w(o,r,n,v,l,b,e,c,u,h,a,t,i),n}}();
\ No newline at end of file
diff --git a/package.json b/package.json
index 523b92d..1b7a4e5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "domdiff",
-  "version": "2.1.0",
+  "version": "2.2.2",
   "description": "A fast and simple way to diff childNodes",
   "unpkg": "min.js",
   "main": "cjs/index.js",
@@ -23,35 +23,20 @@
   "author": "Andrea Giammarchi",
   "license": "ISC",
   "devDependencies": {
-    "ascjs": "^2.5.1",
-    "babel-cli": "^6.26.0",
-    "babel-plugin-check-es2015-constants": "^6.22.0",
-    "babel-plugin-transform-es2015-arrow-functions": "^6.22.0",
-    "babel-plugin-transform-es2015-block-scoped-functions": "^6.22.0",
-    "babel-plugin-transform-es2015-block-scoping": "^6.26.0",
-    "babel-plugin-transform-es2015-classes": "^6.24.1",
-    "babel-plugin-transform-es2015-computed-properties": "^6.24.1",
-    "babel-plugin-transform-es2015-destructuring": "^6.23.0",
-    "babel-plugin-transform-es2015-duplicate-keys": "^6.24.1",
-    "babel-plugin-transform-es2015-function-name": "^6.24.1",
-    "babel-plugin-transform-es2015-literals": "^6.22.0",
-    "babel-plugin-transform-es2015-shorthand-properties": "^6.24.1",
-    "babel-plugin-transform-es2015-spread": "^6.22.0",
-    "babel-plugin-transform-es2015-template-literals": "^6.22.0",
-    "coveralls": "^3.0.5",
+    "@babel/core": "^7.8.7",
+    "@babel/preset-env": "^7.8.7",
+    "ascjs": "^3.1.2",
+    "coveralls": "^3.0.9",
     "istanbul": "^0.4.5",
-    "rollup": "^0.52.3",
-    "rollup-plugin-babel": "^3.0.7",
-    "rollup-plugin-node-resolve": "^3.4.0",
+    "rollup": "^2.0.6",
+    "rollup-plugin-babel": "^4.4.0",
+    "rollup-plugin-node-resolve": "^5.2.0",
     "tressa": "^0.3.1",
-    "uglify-js": "^2.8.29"
+    "uglify-js": "^3.8.0"
   },
   "directories": {
     "test": "test"
   },
-  "dependencies": {
-    "@ungap/essential-map": "^0.2.0"
-  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/WebReflection/domdiff.git"
@@ -59,5 +44,8 @@
   "bugs": {
     "url": "https://github.com/WebReflection/domdiff/issues"
   },
-  "homepage": "https://github.com/WebReflection/domdiff#readme"
+  "homepage": "https://github.com/WebReflection/domdiff#readme",
+  "dependencies": {
+    "uarray": "^1.0.0"
+  }
 }
diff --git a/rollup.config.js b/rollup.config.js
index 1b048e2..5366875 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -1,14 +1,11 @@
 import babel from 'rollup-plugin-babel';
 import resolve from 'rollup-plugin-node-resolve';
-
 export default {
   input: 'esm/index.js',
   plugins: [
-    resolve({
-      module: true
-    }),
+    resolve(),
     babel({
-      plugins: require('./babel-plugins.json')
+      presets: ['@babel/preset-env']
     })
   ],
   context: 'null',