diff --git a/gulpfile.helper.js b/gulpfile.helper.js
index 4fd9e499..a1731866 100644
--- a/gulpfile.helper.js
+++ b/gulpfile.helper.js
@@ -13,13 +13,13 @@ module.exports = function (gulp, helperOptions) {
       port: '8888',
       testfiles: '**/*.spec.js',
       browserify: helperOptions.browserify != null ? helperOptions.browserify : false,
-      regenerator: false,
+      regenerator: true,
+      includeRuntime: helperOptions.includeRuntime || false,
       debug: false
     }
   })
   if (options.regenerator === 'false') {
     options.regenerator = false
-    // TODO: include './node_modules/gulp-babel/node_modules/babel-core/node_modules/regenerator/runtime.js'
   }
   var files = {
     dist: helperOptions.entry,
@@ -34,29 +34,31 @@ module.exports = function (gulp, helperOptions) {
   if (!options.regenerator) {
     babelOptions.blacklist = 'regenerator'
   } else {
-    helperOptions.polyfills.push(files.dist)
-    files.dist = helperOptions.polyfills
+
+  }
+
+  if (options.includeRuntime) {
+    files.dist = ['node_modules/regenerator/runtime.js', files.dist]
   }
 
   gulp.task('dist', function () {
     var browserify = require('browserify')
     var source = require('vinyl-source-stream')
     var buffer = require('vinyl-buffer')
-
+    var babelify = require('babelify')
     gulp.src(['./README.md'])
       .pipe($.watch('./README.md'))
       .pipe(gulp.dest('./dist/'))
     console.log(JSON.stringify(files.dist))
     return browserify({
       entries: files.dist,
-      debug: options.debug
-    }).transform("babelify", {presets: ["es2015"], plugins: ['transform-runtime']})
+      debug: true
+    }).transform(babelify, {presets: ['es2015']})
       .bundle()
       .pipe(source(options.targetName))
       .pipe(buffer())
-      .pipe($.if(options.debug, $.sourcemaps.init({loadMaps: true})))
-      .pipe($.if(true, $.babel(babelOptions)))
-      .pipe($.if(!options.debug && options.regenerator, $.uglify()))
+      .pipe($.sourcemaps.init({loadMaps: true}))
+      //.pipe($.if(!options.debug && options.regenerator, $.uglify()))
       .pipe($.if(options.debug, $.sourcemaps.write('.')))
       .pipe(gulp.dest('./dist/'))
   })
diff --git a/gulpfile.js b/gulpfile.js
index 8fcf38bb..da21661d 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -52,6 +52,7 @@ require('./gulpfile.helper.js')(gulp, {
   entry: './src/y.js',
   targetName: 'y.js',
   moduleName: 'yjs',
+  includeRuntime: true,
   specs: [
     './src/Types/Map.spec.js',
     './src/Database.spec.js'
diff --git a/package.json b/package.json
index bf05472b..ef980817 100644
--- a/package.json
+++ b/package.json
@@ -41,13 +41,11 @@
   },
   "homepage": "http://y-js.org",
   "devDependencies": {
-    "babel-eslint": "^4.1.2",
     "babel-plugin-transform-runtime": "^6.1.18",
     "babel-preset-es2015": "^6.1.18",
     "babelify": "^7.2.0",
     "browserify": "^12.0.1",
     "gulp": "^3.9.0",
-    "gulp-babel": "^6.1.0",
     "gulp-bump": "^1.0.0",
     "gulp-concat": "^2.6.0",
     "gulp-filter": "^3.0.1",
@@ -70,7 +68,6 @@
     "run-sequence": "^1.1.4",
     "standard": "^5.2.2",
     "vinyl-buffer": "^1.0.0",
-    "vinyl-source-stream": "^1.1.0",
-    "watchify": "^3.6.0"
+    "vinyl-source-stream": "^1.1.0"
   }
 }