Switched to ES6