Now using regex rather than another sub-process