Now with more regex