regex non-capturing groups added