Now with fancy new regex