better supporting bundles