Added improved regex