Removed regex* in preparation for branching