updated for *'d wildcards