update for latest es6