Oredev updates to ES6