Currently fixing replacing wildcards