more converting stuff to es6