changing regex pattern to accomodate 'new' CL structure