changes to bundles and stuff