diff --git a/dist/main.js b/dist/main.js
index 82e1540..74567e4 100644
--- a/dist/main.js
+++ b/dist/main.js
@@ -1 +1 @@
-!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define([],e):"object"==typeof exports?exports.Derekstrap=e():t.Derekstrap=e()}(window,(function(){return function(t){var e={};function n(r){if(e[r])return e[r].exports;var i=e[r]={i:r,l:!1,exports:{}};return t[r].call(i.exports,i,i.exports,n),i.l=!0,i.exports}return n.m=t,n.c=e,n.d=function(t,e,r){n.o(t,e)||Object.defineProperty(t,e,{enumerable:!0,get:r})},n.r=function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},n.t=function(t,e){if(1&e&&(t=n(t)),8&e)return t;if(4&e&&"object"==typeof t&&t&&t.__esModule)return t;var r=Object.create(null);if(n.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:t}),2&e&&"string"!=typeof t)for(var i in t)n.d(r,i,function(e){return t[e]}.bind(null,i));return r},n.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return n.d(e,"a",e),e},n.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},n.p="",n(n.s=0)}([function(t,e,n){"use strict";n.r(e),n.d(e,"debounce",(function(){return r})),n.d(e,"Derekstrap",(function(){return a})),n.d(e,"Breakpoints",(function(){return u}));var r=function(t,e,n){var r;return function(){var i=this,o=arguments,u=function(){r=null,n||t.apply(i,o)},a=n&&!r;clearTimeout(r),r=setTimeout(u,e),a&&t.apply(i,o)}};var i=function(){document.documentElement.setAttribute("data-useragent",navigator.userAgent)},o={breakpoints:{},current:[],currentBreakpoint:"",init:function(t){this.breakpoints=t,this.currentBreakpoint=this.getCurrent(),this.current=this.get(),window.addEventListener("resize",this.eventEmitter)},getCurrent:function(){var t=Object.entries(this.breakpoints).reduce((function(t,e){return t&&!window.matchMedia("(min-width:"+t[1]+")").matches&&(t=null),window.matchMedia("(min-width:"+e[1]+")").matches&&t&&Number(t[1].replace(/\D/g,""))<Number(e[1].replace(/\D/g,""))?e:t}));return t?t[0]:null},get:function(){return Object.entries(this.breakpoints).filter((function(t){if(window.matchMedia("(min-width:"+t[1]+")").matches)return!0})).map((function(t){return t[0]}))},minWidth:function(t){return window.matchMedia("(min-width:"+this.breakpoints[t]+")").matches},eventEmitter:r((function(){var t=o.getCurrent();t!==o.currentBreakpoint&&(window.dispatchEvent(new CustomEvent("breakpointChange",{detail:{breakpoint:t,lastBreakpoint:o.currentBreakpoint}})),o.currentBreakpoint=t,o.current=o.get())}),50)},u=o,a={init:function(){i()}}}])}));
\ No newline at end of file
+!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define([],e):"object"==typeof exports?exports.Derekstrap=e():t.Derekstrap=e()}(window,(function(){return function(t){var e={};function n(r){if(e[r])return e[r].exports;var i=e[r]={i:r,l:!1,exports:{}};return t[r].call(i.exports,i,i.exports,n),i.l=!0,i.exports}return n.m=t,n.c=e,n.d=function(t,e,r){n.o(t,e)||Object.defineProperty(t,e,{enumerable:!0,get:r})},n.r=function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},n.t=function(t,e){if(1&e&&(t=n(t)),8&e)return t;if(4&e&&"object"==typeof t&&t&&t.__esModule)return t;var r=Object.create(null);if(n.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:t}),2&e&&"string"!=typeof t)for(var i in t)n.d(r,i,function(e){return t[e]}.bind(null,i));return r},n.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return n.d(e,"a",e),e},n.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},n.p="",n(n.s=0)}([function(t,e,n){"use strict";n.r(e),n.d(e,"debounce",(function(){return r})),n.d(e,"Derekstrap",(function(){return a})),n.d(e,"Breakpoints",(function(){return u}));var r=function(t,e,n){var r;return function(){var i=this,o=arguments,u=function(){r=null,n||t.apply(i,o)},a=n&&!r;clearTimeout(r),r=setTimeout(u,e),a&&t.apply(i,o)}};var i=function(){document.documentElement.setAttribute("data-useragent",navigator.userAgent)},o={breakpoints:{},current:[],currentBreakpoint:"",init:function(t){this.breakpoints=t,this.currentBreakpoint=this.getCurrent(),this.current=this.get(),window.addEventListener("resize",this.eventEmitter)},getCurrent:function(){var t=Object.entries(this.breakpoints).reduce((function(t,e){return t&&!window.matchMedia("(min-width:"+t[1]+")").matches&&(t=null),window.matchMedia("(min-width:"+e[1]+")").matches&&t&&Number(t[1].replace(/\D/g,""))<Number(e[1].replace(/\D/g,""))?e:t}));return t?t[0]:null},get:function(){return Object.entries(this.breakpoints).filter((function(t){if(window.matchMedia("(min-width:"+t[1]+")").matches)return!0})).map((function(t){return t[0]}))},minWidth:function(t){return window.matchMedia("(min-width:"+this.breakpoints[t]+")").matches},eventEmitter:r((function(){var t=o.getCurrent();if(t!==o.currentBreakpoint){var e=o.currentBreakpoint;o.currentBreakpoint=t,o.current=o.get(),window.dispatchEvent(new CustomEvent("breakpointChange",{detail:{breakpoint:t,breakpoints:breakpoints.current,lastBreakpoint:e}}))}}),50)},u=o,a={init:function(){i()}}}])}));
\ No newline at end of file
diff --git a/package.json b/package.json
index e418a70..d15ad91 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@evanshunt/derekstrap",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "description": "A base layout and styles library by Evans Hunt",
   "main": "dist/main.js",
   "sass": "_index.scss",
diff --git a/src/Breakpoints.js b/src/Breakpoints.js
index 42b100c..a21cd0f 100644
--- a/src/Breakpoints.js
+++ b/src/Breakpoints.js
@@ -46,14 +46,17 @@ const Breakpoints = {
     eventEmitter: debounce(() => {
         const newBreakpoint = Breakpoints.getCurrent();
         if (newBreakpoint !== Breakpoints.currentBreakpoint) {
+            const oldBreakpoint = Breakpoints.currentBreakpoint;
+            Breakpoints.currentBreakpoint = newBreakpoint;
+            Breakpoints.current = Breakpoints.get();
+
             window.dispatchEvent(new CustomEvent('breakpointChange', {
                 detail: {
                     breakpoint: newBreakpoint,
-                    lastBreakpoint: Breakpoints.currentBreakpoint
+                    breakpoints: breakpoints.current,
+                    lastBreakpoint: oldBreakpoint
                 }
             }));
-            Breakpoints.currentBreakpoint = newBreakpoint;
-            Breakpoints.current = Breakpoints.get();
         }
     }, 50),
 };