upgraded wac matcher