added wildcard option