more bundles and changes