better handling of bundles