Still tweaking the regex