updated for maching wild cards