Updated regex