change to regex matching