es6 regex update
adjust regex