Updated regex again