Updated to regex matches