Switched from ES5 to ES6