Updated for ES6